@fadhilp/stateql 0.5.3 → 0.5.4

package/dist/src/sql.js

@@ -23,7 +23,10 @@ export function analyzeSql(sql, driver) {
             : driver === "mysql"
                 ? "MySQL"
                 : "Sqlite";
-        const parsed = parser.astify(trimmed, { database });
+        const parserSql = driver === "postgres"
+            ? postgresParserSql(trimmed)
+            : trimmed;
+        const parsed = parser.astify(parserSql, { database });
         if (Array.isArray(parsed)) {
             if (parsed.length !== 1) {
                 throw new StateQLError("INVALID_SQL", "Exactly one SQL statement is required.");
@@ -40,11 +43,15 @@ export function analyzeSql(sql, driver) {
         if (statementType === "select" && selectContainsWrite(ast)) {
             throw new StateQLError("INVALID_SQL", "Read statements cannot contain writes or SELECT INTO.");
         }
-        const normalized = parser
-            .sqlify(ast, { database })
-            .replace(/;\s*$/, "")
-            .replace(/\s+/g, " ")
-            .trim();
+        const normalized = parserSql === trimmed
+            ? parser
+                .sqlify(ast, { database })
+                .replace(/;\s*$/, "")
+                .replace(/\s+/g, " ")
+                .trim()
+            // Keep the exact ordering modifiers in cache and idempotency fingerprints.
+            // The parser copy is analysis-only; adapters execute the original SQL.
+            : trimmed.replace(/;\s*$/, "");
         const details = ast;
         const read = statementType === "select";
         const mutation = statementType === "update" ||
@@ -74,6 +81,151 @@ export function analyzeSql(sql, driver) {
         throw new StateQLError("INVALID_SQL", message);
     }
 }
+function postgresParserSql(sql) {
+    const output = sql.split("");
+    const orderDepths = new Set();
+    let previousWord;
+    let changed = false;
+    let depth = 0;
+    let index = 0;
+    while (index < sql.length) {
+        if (sql.startsWith("--", index)) {
+            index = lineCommentEnd(sql, index + 2);
+            continue;
+        }
+        if (sql.startsWith("/*", index)) {
+            index = blockCommentEnd(sql, index + 2);
+            continue;
+        }
+        const character = sql[index];
+        if (character === "'" || character === '"') {
+            previousWord = undefined;
+            index = quotedEnd(sql, index + 1, character);
+            continue;
+        }
+        if (character === "$") {
+            const delimiter = sql.slice(index).match(/^\$(?:[A-Za-z_][A-Za-z0-9_]*)?\$/)?.[0];
+            if (delimiter) {
+                previousWord = undefined;
+                const end = sql.indexOf(delimiter, index + delimiter.length);
+                index = end < 0 ? sql.length : end + delimiter.length;
+                continue;
+            }
+        }
+        if (character === "(") {
+            previousWord = undefined;
+            depth += 1;
+            index += 1;
+            continue;
+        }
+        if (character === ")") {
+            previousWord = undefined;
+            orderDepths.delete(depth);
+            depth = Math.max(0, depth - 1);
+            index += 1;
+            continue;
+        }
+        if (!identifierStart(character)) {
+            if (!/\s/u.test(character))
+                previousWord = undefined;
+            if (character === ";")
+                orderDepths.clear();
+            index += 1;
+            continue;
+        }
+        let end = index + 1;
+        while (identifierPart(sql[end]))
+            end += 1;
+        const word = sql.slice(index, end).toUpperCase();
+        if (word === "NULLS" && orderDepths.has(depth)) {
+            const ordering = triviaEnd(sql, end);
+            const modifier = sql.slice(ordering, ordering + 5).toUpperCase();
+            const length = modifier === "FIRST" ? 5 : modifier.startsWith("LAST") ? 4 : 0;
+            if (length && !identifierPart(sql[ordering + length])) {
+                for (let cursor = index; cursor < end; cursor += 1)
+                    output[cursor] = " ";
+                for (let cursor = ordering; cursor < ordering + length; cursor += 1)
+                    output[cursor] = " ";
+                changed = true;
+                previousWord = undefined;
+                index = ordering + length;
+                continue;
+            }
+        }
+        if (word === "BY" && previousWord === "ORDER")
+            orderDepths.add(depth);
+        if (["LIMIT", "OFFSET", "FETCH", "FOR", "UNION", "INTERSECT", "EXCEPT"].includes(word)) {
+            orderDepths.delete(depth);
+        }
+        previousWord = word === "ORDER" ? word : undefined;
+        index = end;
+    }
+    return changed ? output.join("") : sql;
+}
+function triviaEnd(sql, start) {
+    let index = start;
+    while (index < sql.length) {
+        if (/\s/u.test(sql[index])) {
+            index += 1;
+        }
+        else if (sql.startsWith("--", index)) {
+            index = lineCommentEnd(sql, index + 2);
+        }
+        else if (sql.startsWith("/*", index)) {
+            index = blockCommentEnd(sql, index + 2);
+        }
+        else {
+            break;
+        }
+    }
+    return index;
+}
+function lineCommentEnd(sql, start) {
+    const end = sql.indexOf("\n", start);
+    return end < 0 ? sql.length : end + 1;
+}
+function blockCommentEnd(sql, start) {
+    let depth = 1;
+    let index = start;
+    while (index < sql.length && depth > 0) {
+        if (sql.startsWith("/*", index)) {
+            depth += 1;
+            index += 2;
+        }
+        else if (sql.startsWith("*/", index)) {
+            depth -= 1;
+            index += 2;
+        }
+        else {
+            index += 1;
+        }
+    }
+    return index;
+}
+function quotedEnd(sql, start, quote) {
+    let index = start;
+    while (index < sql.length) {
+        if (sql[index] === "\\" && quote === "'") {
+            index += 2;
+        }
+        else if (sql[index] !== quote) {
+            index += 1;
+        }
+        else if (sql[index + 1] === quote) {
+            index += 2;
+        }
+        else {
+            return index + 1;
+        }
+    }
+    return index;
+}
+function identifierStart(value) {
+    return value !== undefined && /[A-Za-z_\u0080-\uFFFF]/u.test(value);
+}
+function identifierPart(value) {
+    return value !== undefined && /[A-Za-z0-9_$\u0080-\uFFFF]/u.test(value);
+}
 function selectContainsWrite(ast) {
     const details = ast;
     const into = details.into;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fadhilp/stateql",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Stateful, agent-oriented database CLI for safe result reuse",
   "repository": {
     "type": "git",