@deepagents/text2sql 7.0.1 → 7.1.0

package/dist/lib/adapters/sqlite/column-stats.sqlite.grounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column-stats.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/column-stats.sqlite.grounding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,KAAK,0BAA0B,EAChC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,oBAAoB;;gBAGtD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,0BAA+B;cAK5C,YAAY,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CA2EpC"}
+{"version":3,"file":"column-stats.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/column-stats.sqlite.grounding.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,KAAK,0BAA0B,EAChC,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAYvD;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,oBAAoB;;gBAGtD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,0BAA+B;cAK5C,YAAY,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CAuEpC"}

package/dist/lib/adapters/sqlite/column-values.sqlite.grounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column-values.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/column-values.sqlite.grounding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,KAAK,MAAM,EACX,qBAAqB,EACrB,KAAK,2BAA2B,EACjC,MAAM,0CAA0C,CAAC;AAElD;;;;;;;;GAQG;AACH,qBAAa,2BAA4B,SAAQ,qBAAqB;;gBAGxD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,2BAAgC;cAK7C,qBAAqB,CAC5C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;CAmDjC"}
+{"version":3,"file":"column-values.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/column-values.sqlite.grounding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,KAAK,MAAM,EACX,qBAAqB,EACrB,KAAK,2BAA2B,EACjC,MAAM,0CAA0C,CAAC;AAGlD;;;;;;;;GAQG;AACH,qBAAa,2BAA4B,SAAQ,qBAAqB;;gBAGxD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,2BAAgC;cAK7C,qBAAqB,CAC5C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;CAmDjC"}

package/dist/lib/adapters/sqlite/constraint.sqlite.grounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/constraint.sqlite.grounding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,MAAM,uCAAuC,CAAC;AAuB/C;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,mBAAmB;;gBAGpD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,yBAA8B;cAK3C,cAAc,CACrC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC;CAoK9B"}
+{"version":3,"file":"constraint.sqlite.grounding.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/constraint.sqlite.grounding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,MAAM,uCAAuC,CAAC;AAO/C;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,mBAAmB;;gBAGpD,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,yBAA8B;cAK3C,cAAc,CACrC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC;CAwK9B"}

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

@@ -1,5 +1,6 @@
 // packages/text2sql/src/lib/adapters/adapter.ts
 import { format as formatSql } from "sql-formatter";
+import { z } from "zod";
 
 // packages/text2sql/src/lib/agents/exceptions.ts
 var sqlValidationMarker = /* @__PURE__ */ Symbol("SQLValidationError");
@@ -432,6 +433,40 @@ var Adapter = class {
     }
     return decoded;
   }
+  /**
+   * Run an introspection query and check every row against `row`, the shape
+   * the driver returns for that query. A row of any other shape throws.
+   */
+  async runQuery(sql, row) {
+    const rows = z.array(row).safeParse(await this.queryRows(sql));
+    if (!rows.success) {
+      throw new Error(
+        `${this.constructor.name} introspection query returned rows of an unexpected shape:
+${z.prettifyError(rows.error)}
+SQL: ${sql.trim()}`,
+        { cause: rows.error }
+      );
+    }
+    return rows.data;
+  }
+  /**
+   * The rows in a driver's execute() result: the result itself when it is an
+   * array, otherwise the first array found at one of `paths` (dot-separated,
+   * so `recordsets.0` reads `result.recordsets[0]`).
+   */
+  rowsFrom(result, paths) {
+    if (Array.isArray(result)) return result;
+    for (const path of paths) {
+      const rows = path.split(".").reduce(
+        (value, key) => typeof value === "object" && value !== null ? Reflect.get(value, key) : void 0,
+        result
+      );
+      if (Array.isArray(rows)) return rows;
+    }
+    throw new Error(
+      `${this.constructor.name} execute() must return an array of rows or an object holding one at ${paths.map((path) => `result.${path}`).join(", ")}.`
+    );
+  }
   /**
    * Convert unknown database value to number.
    * Handles number, bigint, and string types.
@@ -992,6 +1027,12 @@ var TableGrounding = class extends AbstractGrounding {
 };
 
 // packages/text2sql/src/lib/adapters/sqlite/column-stats.sqlite.grounding.ts
+import { z as z2 } from "zod";
+var statsRow = z2.object({
+  min_value: z2.unknown(),
+  max_value: z2.unknown(),
+  null_fraction: z2.number().nullable()
+});
 var SqliteColumnStatsGrounding = class extends ColumnStatsGrounding {
   #adapter;
   constructor(adapter, config = {}) {
@@ -1011,7 +1052,7 @@ var SqliteColumnStatsGrounding = class extends ColumnStatsGrounding {
         AVG(CASE WHEN ${columnIdentifier} IS NULL THEN 1.0 ELSE 0.0 END) AS null_fraction
       FROM ${tableIdentifier}
     `;
-    const rows = await this.#adapter.runQuery(sql);
+    const rows = await this.#adapter.runQuery(sql, statsRow);
     if (!rows.length) {
       return void 0;
     }
@@ -1059,6 +1100,18 @@ var SqliteColumnStatsGrounding = class extends ColumnStatsGrounding {
   }
 };
 
+// packages/text2sql/src/lib/adapters/groundings/rows.ts
+import { z as z3 } from "zod";
+var nameRow = z3.object({ name: z3.string() });
+var versionRow = z3.object({ version: z3.string() });
+var databaseRow = z3.object({ db: z3.string() });
+var viewDefinitionRow = z3.object({
+  definition: z3.string().nullable()
+});
+var distinctValueRow = z3.object({ value: z3.unknown() });
+var textValueRow = z3.object({ value: z3.string() });
+var numericValue = z3.union([z3.number(), z3.bigint(), z3.string()]);
+
 // packages/text2sql/src/lib/adapters/sqlite/column-values.sqlite.grounding.ts
 var SqliteColumnValuesGrounding = class extends ColumnValuesGrounding {
   #adapter;
@@ -1076,7 +1129,7 @@ var SqliteColumnValuesGrounding = class extends ColumnValuesGrounding {
       WHERE ${columnIdentifier} IS NOT NULL
       LIMIT ${limit}
     `;
-    const rows = await this.#adapter.runQuery(sql);
+    const rows = await this.#adapter.runQuery(sql, distinctValueRow);
     if (!rows.length || rows.length > this.lowCardinalityLimit) {
       return void 0;
     }
@@ -1113,6 +1166,38 @@ var SqliteColumnValuesGrounding = class extends ColumnValuesGrounding {
   }
 };
 
+// packages/text2sql/src/lib/adapters/sqlite/sqlite-rows.ts
+import { z as z4 } from "zod";
+var sqliteInteger = z4.union([z4.number(), z4.bigint()]).transform(Number);
+var sqliteMasterSqlRow = z4.object({ sql: z4.string().nullable() });
+var tableInfoRow = z4.object({
+  cid: sqliteInteger,
+  name: z4.string(),
+  type: z4.string(),
+  notnull: sqliteInteger,
+  dflt_value: z4.string().nullable(),
+  pk: sqliteInteger
+});
+var foreignKeyListRow = z4.object({
+  id: sqliteInteger,
+  seq: sqliteInteger,
+  table: z4.string(),
+  from: z4.string(),
+  to: z4.string().nullable()
+});
+var indexListRow = z4.object({
+  seq: sqliteInteger,
+  name: z4.string(),
+  unique: sqliteInteger,
+  origin: z4.string(),
+  partial: sqliteInteger
+});
+var indexInfoRow = z4.object({
+  seqno: sqliteInteger,
+  cid: sqliteInteger,
+  name: z4.string().nullable()
+});
+
 // packages/text2sql/src/lib/adapters/sqlite/constraint.sqlite.grounding.ts
 var SqliteConstraintGrounding = class extends ConstraintGrounding {
   #adapter;
@@ -1123,7 +1208,8 @@ var SqliteConstraintGrounding = class extends ConstraintGrounding {
   async getConstraints(tableName) {
     const constraints2 = [];
     const columns = await this.#adapter.runQuery(
-      `PRAGMA table_info(${this.#quoteIdentifier(tableName)})`
+      `PRAGMA table_info(${this.#quoteIdentifier(tableName)})`,
+      tableInfoRow
     );
     const pkColumns = columns.filter((col) => col.pk > 0).sort((a, b) => a.pk - b.pk).map((col) => col.name);
     if (pkColumns.length > 0) {
@@ -1151,7 +1237,8 @@ var SqliteConstraintGrounding = class extends ConstraintGrounding {
       }
     }
     const fkRows = await this.#adapter.runQuery(
-      `PRAGMA foreign_key_list(${this.#quoteIdentifier(tableName)})`
+      `PRAGMA foreign_key_list(${this.#quoteIdentifier(tableName)})`,
+      foreignKeyListRow
     );
     const fkGroups = /* @__PURE__ */ new Map();
     for (const row of fkRows) {
@@ -1166,11 +1253,13 @@ var SqliteConstraintGrounding = class extends ConstraintGrounding {
         type: "FOREIGN_KEY",
         columns: rows.map((r) => r.from),
         referencedTable: rows[0].table,
-        referencedColumns: rows.map((r) => r.to)
+        // A key that references the parent's primary key names no columns.
+        referencedColumns: rows.flatMap((r) => r.to === null ? [] : [r.to])
       });
     }
     const ddlRows = await this.#adapter.runQuery(
-      `SELECT sql FROM sqlite_master WHERE type='table' AND name=${this.#quoteIdentifier(tableName)}`
+      `SELECT sql FROM sqlite_master WHERE type='table' AND name=${this.#quoteIdentifier(tableName)}`,
+      sqliteMasterSqlRow
     );
     if (ddlRows[0]?.sql) {
       const columnNames = columns.map((c) => c.name);
@@ -1247,15 +1336,17 @@ var SqliteIndexesGrounding = class extends IndexesGrounding {
   }
   async getIndexes(tableName) {
     const indexListRows = await this.#adapter.runQuery(
-      `PRAGMA index_list(${this.#quoteIdentifier(tableName)})`
+      `PRAGMA index_list(${this.#quoteIdentifier(tableName)})`,
+      indexListRow
     );
     const indexes2 = [];
     for (const indexRow of indexListRows) {
       if (!indexRow.name) continue;
       const indexInfoRows = await this.#adapter.runQuery(
-        `PRAGMA index_info(${this.#quoteIdentifier(indexRow.name)})`
+        `PRAGMA index_info(${this.#quoteIdentifier(indexRow.name)})`,
+        indexInfoRow
       );
-      const columns = indexInfoRows.filter((row) => row.name != null).sort((a, b) => a.seqno - b.seqno).map((row) => row.name);
+      const columns = indexInfoRows.toSorted((a, b) => a.seqno - b.seqno).flatMap((row) => row.name === null ? [] : [row.name]);
       if (!columns.length) continue;
       indexes2.push({
         name: indexRow.name,
@@ -1280,7 +1371,8 @@ var SqliteInfoGrounding = class extends InfoGrounding {
   }
   async collectInfo() {
     const rows = await this.#adapter.runQuery(
-      "SELECT sqlite_version() AS version"
+      "SELECT sqlite_version() AS version",
+      versionRow
     );
     return {
       dialect: "sqlite",
@@ -1293,6 +1385,8 @@ var SqliteInfoGrounding = class extends InfoGrounding {
 };
 
 // packages/text2sql/src/lib/adapters/sqlite/row-count.sqlite.grounding.ts
+import { z as z5 } from "zod";
+var countRow = z5.object({ count: sqliteInteger });
 var SqliteRowCountGrounding = class extends RowCountGrounding {
   #adapter;
   constructor(adapter, config = {}) {
@@ -1301,9 +1395,10 @@ var SqliteRowCountGrounding = class extends RowCountGrounding {
   }
   async getRowCount(tableName) {
     const rows = await this.#adapter.runQuery(
-      `SELECT COUNT(*) as count FROM ${this.#adapter.quoteIdentifier(tableName)}`
+      `SELECT COUNT(*) as count FROM ${this.#adapter.quoteIdentifier(tableName)}`,
+      countRow
     );
-    return this.#adapter.toNumber(rows[0]?.count);
+    return rows[0]?.count;
   }
 };
 
@@ -1726,17 +1821,8 @@ var Sqlite = class extends Adapter {
   #quoteIdentifier(name) {
     return `'${name.replace(/'/g, "''")}'`;
   }
-  async runQuery(sql) {
-    const result = await this.#options.execute(sql);
-    if (Array.isArray(result)) {
-      return result;
-    }
-    if (result && typeof result === "object" && "rows" in result && Array.isArray(result.rows)) {
-      return result.rows;
-    }
-    throw new Error(
-      "Sqlite adapter execute() must return an array of rows or an object with a rows array when introspecting."
-    );
+  async queryRows(sql) {
+    return this.rowsFrom(await this.#options.execute(sql), ["rows"]);
   }
   quoteIdentifier(name) {
     return `"${name.replace(/"/g, '""')}"`;
@@ -1759,45 +1845,44 @@ var SqliteTableGrounding = class extends TableGrounding {
     this.#adapter = adapter;
   }
   async getAllTableNames() {
-    const rows = await this.#adapter.runQuery(`SELECT name FROM sqlite_master WHERE type='table' ORDER BY name`);
-    return rows.map((row) => row.name).filter(
-      (name) => typeof name === "string" && !name.startsWith("sqlite_")
+    const rows = await this.#adapter.runQuery(
+      `SELECT name FROM sqlite_master WHERE type='table' ORDER BY name`,
+      nameRow
     );
+    return rows.map((row) => row.name).filter((name) => !name.startsWith("sqlite_"));
   }
   async getTable(tableName) {
     const columns = await this.#adapter.runQuery(
-      `PRAGMA table_info(${this.#quoteIdentifier(tableName)})`
+      `PRAGMA table_info(${this.#quoteIdentifier(tableName)})`,
+      tableInfoRow
     );
     return {
       name: tableName,
       rawName: tableName,
-      columns: columns.map((col) => ({
-        name: col.name ?? "unknown",
-        type: col.type ?? "unknown"
-      }))
+      columns: columns.map((col) => ({ name: col.name, type: col.type }))
     };
   }
   async findOutgoingRelations(tableName) {
     const rows = await this.#adapter.runQuery(
-      `PRAGMA foreign_key_list(${this.#quoteIdentifier(tableName)})`
+      `PRAGMA foreign_key_list(${this.#quoteIdentifier(tableName)})`,
+      foreignKeyListRow
     );
     const groups = /* @__PURE__ */ new Map();
     for (const row of rows) {
-      if (row.id == null || row.table == null || row.from == null || row.to == null) {
+      if (row.to === null) {
         continue;
       }
-      const id = Number(row.id);
-      const existing = groups.get(id);
+      const existing = groups.get(row.id);
       if (!existing) {
-        groups.set(id, {
+        groups.set(row.id, {
           table: tableName,
-          from: [String(row.from)],
-          referenced_table: String(row.table),
-          to: [String(row.to)]
+          from: [row.from],
+          referenced_table: row.table,
+          to: [row.to]
         });
       } else {
-        existing.from.push(String(row.from));
-        existing.to.push(String(row.to));
+        existing.from.push(row.from);
+        existing.to.push(row.to);
       }
     }
     return Array.from(groups.values());
@@ -1886,27 +1971,29 @@ var SqliteViewGrounding = class extends ViewGrounding {
     this.#adapter = adapter;
   }
   async getAllViewNames() {
-    const rows = await this.#adapter.runQuery(`SELECT name FROM sqlite_master WHERE type='view' ORDER BY name`);
-    return rows.map((row) => row.name).filter((name) => typeof name === "string");
+    const rows = await this.#adapter.runQuery(
+      `SELECT name FROM sqlite_master WHERE type='view' ORDER BY name`,
+      nameRow
+    );
+    return rows.map((row) => row.name);
   }
   async getView(viewName) {
     let definition;
     if (this.includeDefinition) {
       const defRows = await this.#adapter.runQuery(
-        `SELECT sql FROM sqlite_master WHERE type='view' AND name=${this.#quoteIdentifier(viewName)}`
+        `SELECT sql FROM sqlite_master WHERE type='view' AND name=${this.#quoteIdentifier(viewName)}`,
+        sqliteMasterSqlRow
       );
       definition = defRows[0]?.sql ?? void 0;
     }
     const columns = await this.#adapter.runQuery(
-      `PRAGMA table_info(${this.#quoteIdentifier(viewName)})`
+      `PRAGMA table_info(${this.#quoteIdentifier(viewName)})`,
+      tableInfoRow
     );
     return {
       name: viewName,
       definition,
-      columns: columns.map((col) => ({
-        name: col.name ?? "unknown",
-        type: col.type ?? "unknown"
-      }))
+      columns: columns.map((col) => ({ name: col.name, type: col.type }))
     };
   }
   #quoteIdentifier(name) {