@deepagents/text2sql 6.1.0 → 7.0.0

package/dist/lib/adapters/parser-sql-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser-sql-policy.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/parser-sql-policy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,aAAa,GACvB,UAAU,GAAG,OAAO,GAAG,YAAY,GAAG,QAAQ,GAAG,aAAa,CAAC;AASjE,MAAM,MAAM,oBAAoB,GAAG;IACjC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,uBAAuB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAWF;;;GAGG;AACH,8BAAsB,uBAAwB,YAAW,iBAAiB;;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IAC/D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAM;IAEvD,OAAO,CACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CA0FtC"}
+{"version":3,"file":"parser-sql-policy.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/parser-sql-policy.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,aAAa,GACvB,UAAU,GAAG,OAAO,GAAG,YAAY,GAAG,QAAQ,GAAG,aAAa,CAAC;AASjE,MAAM,MAAM,oBAAoB,GAAG;IACjC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,uBAAuB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAWF;;;GAGG;AACH,8BAAsB,uBAAwB,YAAW,iBAAiB;;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IAC/D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAM;IAEvD,OAAO,CACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAiHtC"}

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

@@ -398,7 +398,7 @@ var Adapter = class {
     }
   }
   #decodeShellEscapes(sql) {
-    return sql.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\([().*])/g, "$1").replace(/\\(?=$)/gm, "");
+    return sql.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\([().*$])/g, "$1").replace(/\\(?=$)/gm, "");
   }
   #cachedAllowedEntities = null;
   async #resolveScope() {
@@ -419,6 +419,9 @@ var Adapter = class {
     return this.validateImpl(decoded);
   }
   async execute(sql) {
+    return this.executeImpl(await this.enforceExecutionPolicy(sql));
+  }
+  async enforceExecutionPolicy(sql) {
     const decoded = this.#decodeShellEscapes(sql);
     const violation = await this.#analyzePolicy(decoded);
     if (violation?.kind === "read-only") {
@@ -427,7 +430,7 @@ var Adapter = class {
     if (violation?.kind === "scope") {
       throw new SQLScopeError(violation.payload);
     }
-    return this.executeImpl(decoded);
+    return decoded;
   }
   /**
    * Convert unknown database value to number.
@@ -1433,6 +1436,71 @@ function buildScopeParseErrorPayload(sql, parserDialect, error) {
   };
 }
 
+// packages/text2sql/src/lib/adapters/postgres/postgres-parser-workaround.ts
+var TYPE_BEFORE_LITERAL = /(?<type>(?:pg_catalog\.)?[A-Za-z_][A-Za-z0-9_$]*(?:\s+(?:varying|precision))?(?:\s*\(\s*\d+(?:\s*,\s*\d+)?\s*\))?(?:\s+(?:with|without)\s+time\s+zone)?)\s*$/i;
+var TIME_ZONE_SUFFIX = /^\s+time\s+zone\s+/i;
+var TIME_BEFORE_SUFFIX = /(?<type>time(?:stamp)?(?:\s*\(\s*\d+\s*\))?)\s+(?<qualifier>with|without)$/i;
+function recoverPostgresTypedLiteralParserGap(sql, error) {
+  const errorOffset = parserErrorOffset(error);
+  if (errorOffset === null) return null;
+  const prefix = sql.slice(0, errorOffset);
+  let literalStart = errorOffset;
+  let literalEnd = findLiteralEnd(sql, literalStart);
+  let typeMatch = TYPE_BEFORE_LITERAL.exec(prefix);
+  let type = typeMatch?.groups?.type;
+  if (literalEnd === null) {
+    const suffixMatch = TIME_ZONE_SUFFIX.exec(sql.slice(errorOffset));
+    typeMatch = TIME_BEFORE_SUFFIX.exec(prefix);
+    type = typeMatch?.groups?.type && typeMatch.groups.qualifier && suffixMatch ? `${typeMatch.groups.type} ${typeMatch.groups.qualifier} TIME ZONE` : void 0;
+    literalStart = errorOffset + (suffixMatch?.[0].length ?? 0);
+    literalEnd = findLiteralEnd(sql, literalStart);
+  }
+  if (!type || typeMatch?.index === void 0 || literalEnd === null)
+    return null;
+  return prefix.slice(0, typeMatch.index) + `CAST(${sql.slice(literalStart, literalEnd)} AS ${parserType(type)})` + sql.slice(literalEnd);
+}
+function parserErrorOffset(error) {
+  if (typeof error !== "object" || error === null) return null;
+  const location = Reflect.get(error, "location");
+  if (typeof location !== "object" || location === null) return null;
+  const start = Reflect.get(location, "start");
+  if (typeof start !== "object" || start === null) return null;
+  const offset = Reflect.get(start, "offset");
+  return typeof offset === "number" ? offset : null;
+}
+function findLiteralEnd(sql, start) {
+  if (sql[start] !== "'") {
+    const delimiter = /^\$(?:[A-Za-z_][A-Za-z0-9_]*)?\$/.exec(
+      sql.slice(start)
+    )?.[0];
+    if (!delimiter) return null;
+    const end = sql.indexOf(delimiter, start + delimiter.length);
+    return end === -1 ? null : end + delimiter.length;
+  }
+  let offset = start + 1;
+  while (offset < sql.length) {
+    if (sql[offset] === "\\") {
+      offset += 2;
+      continue;
+    }
+    if (sql[offset] !== "'") {
+      offset++;
+      continue;
+    }
+    if (sql[offset + 1] === "'") {
+      offset += 2;
+      continue;
+    }
+    return offset + 1;
+  }
+  return null;
+}
+function parserType(type) {
+  const unqualified = type.replace(/^pg_catalog\./i, "");
+  const timetz = /^timetz(\s*\([^)]*\))?$/i.exec(unqualified);
+  return timetz ? `TIME${timetz[1] ?? ""} WITH TIME ZONE` : unqualified;
+}
+
 // packages/text2sql/src/lib/adapters/parser-sql-policy.ts
 var READ_ONLY_MESSAGE = "only SELECT or WITH queries allowed";
 var { Parser } = nodeSqlParser;
@@ -1457,7 +1525,7 @@ var ParserSqlPolicyAnalyzer = class {
   #readParsedStatements(sql) {
     for (const dialect of this.dialects) {
       try {
-        return parseStatements(sql, dialect);
+        return this.#parseStatements(sql, dialect);
       } catch {
       }
     }
@@ -1469,7 +1537,7 @@ var ParserSqlPolicyAnalyzer = class {
     let lastDialect = this.dialects[0];
     for (const dialect of this.dialects) {
       try {
-        references = extractBaseEntityReferences(sql, dialect);
+        references = extractBaseEntityReferences(this.#parseAst(sql, dialect));
         break;
       } catch (error) {
         lastDialect = dialect;
@@ -1504,9 +1572,25 @@ var ParserSqlPolicyAnalyzer = class {
     });
     return outOfScope.length === 0 ? null : buildOutOfScopePayload(sql, outOfScope, [...allowedEntities]);
   }
+  #parseStatements(sql, dialect) {
+    return parseStatements(this.#parseAst(sql, dialect));
+  }
+  #parseAst(sql, dialect) {
+    let parserSql = sql;
+    const attempted = /* @__PURE__ */ new Set([sql]);
+    while (true) {
+      try {
+        return parser.astify(parserSql, { database: dialect });
+      } catch (error) {
+        const recovered = dialect === "postgresql" ? recoverPostgresTypedLiteralParserGap(parserSql, error) : null;
+        if (!recovered || attempted.has(recovered)) throw error;
+        attempted.add(recovered);
+        parserSql = recovered;
+      }
+    }
+  }
 };
-function parseStatements(sql, dialect) {
-  const ast = parser.astify(sql, { database: dialect });
+function parseStatements(ast) {
   const statements = Array.isArray(ast) ? ast : [ast];
   return statements.filter(isAstLike);
 }
@@ -1563,8 +1647,7 @@ function appendIdentifierParts(parts, value) {
     ...value.toLowerCase().split(".").filter((part) => part.length > 0)
   );
 }
-function extractBaseEntityReferences(sql, dialect) {
-  const ast = parser.astify(sql, { database: dialect });
+function extractBaseEntityReferences(ast) {
   const state = {
     cteNames: /* @__PURE__ */ new Set(),
     references: /* @__PURE__ */ new Map()