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

package/dist/lib/sql-compiler.js

@@ -20,8 +20,8 @@ export function compilePostgresOperation(operation) {
             compileGroupByClause(operation.groupBy) +
             compileHavingClause(operation.having, context) +
             compileOrderByClause(operation.orderBy) +
-            compileLimitClause(operation.limit) +
-            compileOffsetClause(operation.offset);
+            compileLimitClause(operation.limit, context) +
+            compileOffsetClause(operation.offset, context);
         return {
             text,
             values: context.values,
@@ -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) {
@@ -242,17 +408,17 @@ function compileOrderByClause(orderBy) {
             .map((clause) => quotePath(clause.column) + ' ' + clause.direction.toUpperCase())
             .join(', '));
 }
-function compileLimitClause(limit) {
+function compileLimitClause(limit, context) {
     if (limit === undefined) {
         return '';
     }
-    return ' limit ' + String(limit);
+    return ' limit ' + pushValue(context, limit);
 }
-function compileOffsetClause(offset) {
+function compileOffsetClause(offset, context) {
     if (offset === undefined) {
         return '';
     }
-    return ' offset ' + String(offset);
+    return ' offset ' + pushValue(context, offset);
 }
 function compileReturningClause(returning) {
     if (!returning) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remix-run/data-table-postgres",
-  "version": "0.3.1",
-  "description": "PostgreSQL adapter for remix/data-table",
+  "version": "0.5.0",
+  "description": "PostgreSQL database implementation for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -29,14 +29,14 @@
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@types/pg": "^8.15.6",
-    "@typescript/native-preview": "7.0.0-dev.20251125.1",
+    "typescript": "^7.0.2",
     "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/assert": "0.3.0",
+    "@remix-run/data-table": "0.4.0",
+    "@remix-run/test": "0.6.0"
   },
   "dependencies": {
-    "@remix-run/data-table": "^0.2.1"
+    "@remix-run/data-table": "^0.4.0"
   },
   "peerDependencies": {
     "pg": "^8.16.3"
@@ -54,11 +54,11 @@
     "sql"
   ],
   "scripts": {
-    "build": "tsgo -p tsconfig.build.json",
+    "build": "tsc -p tsconfig.build.json",
     "clean": "git clean -fdX",
-    "test": "remix-test",
-    "test:bun": "bun x --bun remix-test",
-    "test:coverage": "remix-test --coverage",
-    "typecheck": "tsgo --noEmit"
+    "test": "remix test",
+    "test:bun": "bun x --bun remix test",
+    "test:coverage": "remix test --coverage",
+    "typecheck": "tsc --noEmit"
   }
 }

package/src/index.ts

@@ -1 +1,3 @@
-export { createPostgresDatabaseAdapter, PostgresDatabaseAdapter } from './lib/adapter.ts'
+export { createPostgresDatabase, PostgresDatabase } from './lib/database.ts'
+export type { PostgresDatabaseOptions } from './lib/database.ts'
+export type { PostgresDatabaseInput } from './lib/driver.ts'

package/src/lib/database.ts

@@ -0,0 +1,45 @@
+import { Database, type DatabaseOptions } from '@remix-run/data-table'
+
+import { PostgresDatabaseDriver, type PostgresDatabaseInput } from './driver.ts'
+
+/** Options for creating a PostgreSQL database. */
+export interface PostgresDatabaseOptions extends DatabaseOptions {
+  /** Database used while dropping and recreating the configured database (`postgres` by default). */
+  maintenanceDatabase?: string
+  /** Template used to recreate the configured database (`template0` by default). */
+  template?: string
+}
+
+/** A {@link Database} backed by PostgreSQL. */
+export class PostgresDatabase extends Database<'postgres'> {
+  /**
+   * Creates a PostgreSQL-backed database.
+   * @param input PostgreSQL pool configuration, pool, or client.
+   * @param options Database runtime and recreation options.
+   */
+  constructor(input: PostgresDatabaseInput, options: PostgresDatabaseOptions = {}) {
+    super(new PostgresDatabaseDriver(input, options), options)
+  }
+}
+
+/**
+ * Creates a PostgreSQL-backed database.
+ *
+ * @param input PostgreSQL pool configuration, pool, or client.
+ * @param options Database runtime and recreation options.
+ * @returns A PostgreSQL database.
+ * @example
+ * ```ts
+ * import { createPostgresDatabase } from 'remix/data-table/postgres'
+ *
+ * let db = createPostgresDatabase({
+ *   connectionString: process.env.DATABASE_URL,
+ * })
+ * ```
+ */
+export function createPostgresDatabase(
+  input: PostgresDatabaseInput,
+  options: PostgresDatabaseOptions = {},
+): PostgresDatabase {
+  return new PostgresDatabase(input, options)
+}