@deepagents/text2sql 0.32.0 → 0.33.0

package/dist/lib/agents/result-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,WAAW,EAIjB,MAAM,WAAW,CAAC;AAMnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAOtD,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAsMD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,6BAA6B;IAC7B,UAAU,EAAE,WAAW,CAAC;CACzB;AASD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;kCA+C/B,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DzC"}
+{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,WAAW,EAKjB,MAAM,WAAW,CAAC;AAMnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAOtD,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AA0QD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,6BAA6B;IAC7B,UAAU,EAAE,WAAW,CAAC;CACzB;AASD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;kCAmD/B,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DzC"}

package/dist/lib/synthesis/decorators/deduplicated-producer.d.ts

@@ -1,6 +1,7 @@
 import { type ExtractedPair, PairProducer } from '../types.ts';
 export interface DeduplicatedProducerOptions {
     strategy?: 'exact' | 'sql-only' | 'question-only';
+    dialect?: string;
 }
 /**
  * DeduplicatedProducer - Remove duplicate pairs from another producer.

package/dist/lib/synthesis/decorators/deduplicated-producer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deduplicated-producer.d.ts","sourceRoot":"","sources":["../../../../src/lib/synthesis/decorators/deduplicated-producer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,eAAe,CAAC;CACnD;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;IAMlD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IANjB;;;OAGG;gBAEO,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,2BAAgC;IAKnD;;;OAGG;IACI,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;IAkCjD,OAAO,CAAC,YAAY;CAGrB"}
+{"version":3,"file":"deduplicated-producer.d.ts","sourceRoot":"","sources":["../../../../src/lib/synthesis/decorators/deduplicated-producer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,eAAe,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;IAMlD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IANjB;;;OAGG;gBAEO,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,2BAAgC;IAKnD;;;OAGG;IACI,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;IAkCjD,OAAO,CAAC,YAAY;CAUrB"}

package/dist/lib/synthesis/decorators/filtered-producer.d.ts

@@ -2,6 +2,7 @@ import { type ExtractedPair, PairProducer } from '../types.ts';
 export interface FilteredProducerOptions {
     successOnly?: boolean;
     tables?: string[];
+    dialect?: string;
     filter?: (pair: ExtractedPair) => boolean;
 }
 /**
@@ -10,6 +11,7 @@ export interface FilteredProducerOptions {
  * Wraps another PairProducer and filters the output based on criteria.
  */
 export declare class FilteredProducer extends PairProducer {
+    #private;
     private producer;
     private options;
     /**
@@ -22,5 +24,6 @@ export declare class FilteredProducer extends PairProducer {
      * @returns Pairs matching all configured filter criteria
      */
     produce(): AsyncGenerator<ExtractedPair[]>;
+    private matchesTables;
 }
 //# sourceMappingURL=filtered-producer.d.ts.map

package/dist/lib/synthesis/decorators/filtered-producer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filtered-producer.d.ts","sourceRoot":"","sources":["../../../../src/lib/synthesis/decorators/filtered-producer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,WAAW,uBAAuB;IACtC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;CAC3C;AAED;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,YAAY;IAM9C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IANjB;;;OAGG;gBAEO,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,uBAA4B;IAK/C;;;OAGG;IACI,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;CA2BlD"}
+{"version":3,"file":"filtered-producer.d.ts","sourceRoot":"","sources":["../../../../src/lib/synthesis/decorators/filtered-producer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,WAAW,uBAAuB;IACtC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;CAC3C;AAED;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,YAAY;;IAM9C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IANjB;;;OAGG;gBAEO,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,uBAA4B;IAK/C;;;OAGG;IACI,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;IA0BjD,OAAO,CAAC,aAAa;CAetB"}

package/dist/lib/synthesis/index.js

@@ -1,3 +1,6 @@
+// packages/text2sql/src/lib/synthesis/decorators/filtered-producer.ts
+import nodeSqlParser from "node-sql-parser";
+
 // packages/text2sql/src/lib/synthesis/types.ts
 var PairProducer = class {
   from(producer) {
@@ -18,6 +21,8 @@ async function toPairs(producer) {
 }
 
 // packages/text2sql/src/lib/synthesis/decorators/filtered-producer.ts
+var { Parser } = nodeSqlParser;
+var parser = new Parser();
 var FilteredProducer = class extends PairProducer {
   /**
    * @param producer - Source producer to filter
@@ -39,11 +44,7 @@ var FilteredProducer = class extends PairProducer {
           return false;
         }
         if (this.options.tables?.length) {
-          const sqlLower = pair.sql.toLowerCase();
-          const hasTable = this.options.tables.some(
-            (t) => sqlLower.includes(t.toLowerCase())
-          );
-          if (!hasTable) return false;
+          if (!this.matchesTables(pair.sql, this.options.tables)) return false;
         }
         if (this.options.filter && !this.options.filter(pair)) {
           return false;
@@ -55,9 +56,28 @@ var FilteredProducer = class extends PairProducer {
       }
     }
   }
+  #filterNames;
+  matchesTables(sql, tables) {
+    const unqualify = (name) => name.split(".").pop().toLowerCase();
+    this.#filterNames ??= new Set(tables.map(unqualify));
+    const filterNames = this.#filterNames;
+    try {
+      const refs = parser.tableList(sql, {
+        database: this.options.dialect
+      });
+      const sqlNames = refs.map((r) => r.split("::").pop().toLowerCase());
+      return sqlNames.some((t) => filterNames.has(t));
+    } catch {
+      const sqlLower = sql.toLowerCase();
+      return tables.some((t) => sqlLower.includes(t.toLowerCase()));
+    }
+  }
 };
 
 // packages/text2sql/src/lib/synthesis/decorators/deduplicated-producer.ts
+import nodeSqlParser2 from "node-sql-parser";
+var { Parser: Parser2 } = nodeSqlParser2;
+var parser2 = new Parser2();
 var DeduplicatedProducer = class extends PairProducer {
   /**
    * @param producer - Source producer to deduplicate
@@ -101,7 +121,12 @@ var DeduplicatedProducer = class extends PairProducer {
     }
   }
   normalizeSQL(sql) {
-    return sql.toLowerCase().replace(/\s+/g, " ").trim();
+    try {
+      const ast = parser2.astify(sql, { database: this.options.dialect });
+      return parser2.sqlify(ast, { database: this.options.dialect }).toLowerCase();
+    } catch {
+      return sql.toLowerCase().replace(/\s+/g, " ").trim();
+    }
   }
 };