@remix-run/data-table-postgres 0.3.1 → 0.4.0

package/dist/lib/sql-compiler.js

@@ -185,17 +185,183 @@ function compileRawOperation(statement) {
             values: [...statement.values],
         };
     }
-    let index = 1;
-    let text = statement.text.replace(/\?/g, function replaceParameter() {
-        let placeholder = '$' + String(index);
-        index += 1;
-        return placeholder;
-    });
     return {
-        text,
+        text: rewriteRawPlaceholders(statement.text),
         values: [...statement.values],
     };
 }
+function rewriteRawPlaceholders(text) {
+    let output = '';
+    let index = 0;
+    let placeholderIndex = 1;
+    while (index < text.length) {
+        let char = text[index];
+        if (char === '?') {
+            output += '$' + String(placeholderIndex);
+            placeholderIndex += 1;
+            index += 1;
+            continue;
+        }
+        if ((char === 'E' || char === 'e') && text[index + 1] === "'") {
+            let end = scanEscapeSingleQuotedString(text, index + 1);
+            output += text.slice(index, end);
+            index = end;
+            continue;
+        }
+        if (char === "'") {
+            let end = scanSingleQuotedString(text, index);
+            output += text.slice(index, end);
+            index = end;
+            continue;
+        }
+        if (char === '"') {
+            let end = scanDoubleQuotedIdentifier(text, index);
+            output += text.slice(index, end);
+            index = end;
+            continue;
+        }
+        if (text.startsWith('--', index)) {
+            let end = scanLineComment(text, index);
+            output += text.slice(index, end);
+            index = end;
+            continue;
+        }
+        if (text.startsWith('/*', index)) {
+            let end = scanBlockComment(text, index);
+            output += text.slice(index, end);
+            index = end;
+            continue;
+        }
+        let dollarQuotedStringEnd = scanDollarQuotedString(text, index);
+        if (dollarQuotedStringEnd !== undefined) {
+            output += text.slice(index, dollarQuotedStringEnd);
+            index = dollarQuotedStringEnd;
+            continue;
+        }
+        output += char;
+        index += 1;
+    }
+    return output;
+}
+function scanSingleQuotedString(text, start) {
+    let index = start + 1;
+    while (index < text.length) {
+        if (text[index] === "'") {
+            if (text[index + 1] === "'") {
+                index += 2;
+                continue;
+            }
+            return index + 1;
+        }
+        index += 1;
+    }
+    return text.length;
+}
+function scanEscapeSingleQuotedString(text, start) {
+    let index = start + 1;
+    while (index < text.length) {
+        if (text[index] === '\\') {
+            index += 2;
+            continue;
+        }
+        if (text[index] === "'") {
+            if (text[index + 1] === "'") {
+                index += 2;
+                continue;
+            }
+            return index + 1;
+        }
+        index += 1;
+    }
+    return text.length;
+}
+function scanDoubleQuotedIdentifier(text, start) {
+    let index = start + 1;
+    while (index < text.length) {
+        if (text[index] === '"') {
+            if (text[index + 1] === '"') {
+                index += 2;
+                continue;
+            }
+            return index + 1;
+        }
+        index += 1;
+    }
+    return text.length;
+}
+function scanLineComment(text, start) {
+    let index = start + 2;
+    while (index < text.length && text[index] !== '\n' && text[index] !== '\r') {
+        index += 1;
+    }
+    return index;
+}
+function scanBlockComment(text, start) {
+    let index = start + 2;
+    let depth = 1;
+    while (index < text.length && depth > 0) {
+        if (text.startsWith('/*', index)) {
+            depth += 1;
+            index += 2;
+            continue;
+        }
+        if (text.startsWith('*/', index)) {
+            depth -= 1;
+            index += 2;
+            continue;
+        }
+        index += 1;
+    }
+    return index;
+}
+function scanDollarQuotedString(text, start) {
+    let delimiter = getDollarQuoteDelimiter(text, start);
+    if (delimiter === undefined) {
+        return undefined;
+    }
+    let end = text.indexOf(delimiter, start + delimiter.length);
+    return end === -1 ? text.length : end + delimiter.length;
+}
+function getDollarQuoteDelimiter(text, start) {
+    if (text[start] !== '$') {
+        return undefined;
+    }
+    let index = start + 1;
+    if (text[index] === '$') {
+        return '$$';
+    }
+    if (!isDollarQuoteTagStart(text[index])) {
+        return undefined;
+    }
+    index += 1;
+    while (index < text.length && isDollarQuoteTagPart(text[index])) {
+        index += 1;
+    }
+    if (text[index] !== '$') {
+        return undefined;
+    }
+    return text.slice(start, index + 1);
+}
+function isDollarQuoteTagStart(char) {
+    if (char === undefined) {
+        return false;
+    }
+    return isAsciiLetter(char) || char === '_';
+}
+function isDollarQuoteTagPart(char) {
+    if (char === undefined) {
+        return false;
+    }
+    return isDollarQuoteTagStart(char) || isAsciiDigit(char);
+}
+function isAsciiLetter(char) {
+    let code = char.charCodeAt(0);
+    return (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
+}
+function isAsciiDigit(char) {
+    let code = char.charCodeAt(0);
+    return code >= 48 && code <= 57;
+}
 function compileFromClause(table, joins, context) {
     let output = ' from ' + quotePath(getTableName(table));
     for (let join of joins) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/data-table-postgres",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "PostgreSQL adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -32,11 +32,11 @@
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
     "pg": "^8.16.3",
     "@remix-run/assert": "0.2.0",
-    "@remix-run/data-table": "0.2.1",
-    "@remix-run/test": "0.3.0"
+    "@remix-run/data-table": "0.3.0",
+    "@remix-run/test": "0.4.0"
   },
   "dependencies": {
-    "@remix-run/data-table": "^0.2.1"
+    "@remix-run/data-table": "^0.3.0"
   },
   "peerDependencies": {
     "pg": "^8.16.3"