@remix-run/data-table-postgres 0.1.0 → 0.2.0

package/dist/lib/sql-compiler.js

@@ -1,37 +1,38 @@
 import { getTableName, getTablePrimaryKey } from '@remix-run/data-table';
-export function compilePostgresStatement(statement) {
-    if (statement.kind === 'raw') {
-        return compileRawStatement(statement.sql);
+import { collectColumns as collectColumnsHelper, normalizeJoinType as normalizeJoinTypeHelper, quotePath as quotePathHelper, } from '@remix-run/data-table/sql-helpers';
+export function compilePostgresOperation(operation) {
+    if (operation.kind === 'raw') {
+        return compileRawOperation(operation.sql);
     }
     let context = { values: [] };
-    if (statement.kind === 'select') {
+    if (operation.kind === 'select') {
         let selection = '*';
-        if (statement.select !== '*') {
-            selection = statement.select
+        if (operation.select !== '*') {
+            selection = operation.select
                 .map((field) => quotePath(field.column) + ' as ' + quoteIdentifier(field.alias))
                 .join(', ');
         }
         let text = 'select ' +
-            (statement.distinct ? 'distinct ' : '') +
+            (operation.distinct ? 'distinct ' : '') +
             selection +
-            compileFromClause(statement.table, statement.joins, context) +
-            compileWhereClause(statement.where, context) +
-            compileGroupByClause(statement.groupBy) +
-            compileHavingClause(statement.having, context) +
-            compileOrderByClause(statement.orderBy) +
-            compileLimitClause(statement.limit) +
-            compileOffsetClause(statement.offset);
+            compileFromClause(operation.table, operation.joins, context) +
+            compileWhereClause(operation.where, context) +
+            compileGroupByClause(operation.groupBy) +
+            compileHavingClause(operation.having, context) +
+            compileOrderByClause(operation.orderBy) +
+            compileLimitClause(operation.limit) +
+            compileOffsetClause(operation.offset);
         return {
             text,
             values: context.values,
         };
     }
-    if (statement.kind === 'count' || statement.kind === 'exists') {
+    if (operation.kind === 'count' || operation.kind === 'exists') {
         let inner = 'select 1' +
-            compileFromClause(statement.table, statement.joins, context) +
-            compileWhereClause(statement.where, context) +
-            compileGroupByClause(statement.groupBy) +
-            compileHavingClause(statement.having, context);
+            compileFromClause(operation.table, operation.joins, context) +
+            compileWhereClause(operation.where, context) +
+            compileGroupByClause(operation.groupBy) +
+            compileHavingClause(operation.having, context);
         return {
             text: 'select count(*) as ' +
                 quoteIdentifier('count') +
@@ -42,42 +43,42 @@ export function compilePostgresStatement(statement) {
             values: context.values,
         };
     }
-    if (statement.kind === 'insert') {
-        return compileInsertStatement(statement.table, statement.values, statement.returning, context);
+    if (operation.kind === 'insert') {
+        return compileInsertOperation(operation.table, operation.values, operation.returning, context);
     }
-    if (statement.kind === 'insertMany') {
-        return compileInsertManyStatement(statement.table, statement.values, statement.returning, context);
+    if (operation.kind === 'insertMany') {
+        return compileInsertManyOperation(operation.table, operation.values, operation.returning, context);
     }
-    if (statement.kind === 'update') {
-        let changes = Object.keys(statement.changes);
+    if (operation.kind === 'update') {
+        let changes = Object.keys(operation.changes);
         let assignments = changes
-            .map((column) => quotePath(column) + ' = ' + pushValue(context, statement.changes[column]))
+            .map((column) => quotePath(column) + ' = ' + pushValue(context, operation.changes[column]))
             .join(', ');
         return {
             text: 'update ' +
-                quotePath(getTableName(statement.table)) +
+                quotePath(getTableName(operation.table)) +
                 ' set ' +
                 assignments +
-                compileWhereClause(statement.where, context) +
-                compileReturningClause(statement.returning),
+                compileWhereClause(operation.where, context) +
+                compileReturningClause(operation.returning),
             values: context.values,
         };
     }
-    if (statement.kind === 'delete') {
+    if (operation.kind === 'delete') {
         return {
             text: 'delete from ' +
-                quotePath(getTableName(statement.table)) +
-                compileWhereClause(statement.where, context) +
-                compileReturningClause(statement.returning),
+                quotePath(getTableName(operation.table)) +
+                compileWhereClause(operation.where, context) +
+                compileReturningClause(operation.returning),
             values: context.values,
         };
     }
-    if (statement.kind === 'upsert') {
-        return compileUpsertStatement(statement, context);
+    if (operation.kind === 'upsert') {
+        return compileUpsertOperation(operation, context);
     }
-    throw new Error('Unsupported statement kind');
+    throw new Error('Unsupported operation kind');
 }
-function compileInsertStatement(table, values, returning, context) {
+function compileInsertOperation(table, values, returning, context) {
     let columns = Object.keys(values);
     if (columns.length === 0) {
         return {
@@ -102,7 +103,7 @@ function compileInsertStatement(table, values, returning, context) {
         values: context.values,
     };
 }
-function compileInsertManyStatement(table, rows, returning, context) {
+function compileInsertManyOperation(table, rows, returning, context) {
     if (rows.length === 0) {
         return {
             text: 'select 0 where 1 = 0',
@@ -138,15 +139,15 @@ function compileInsertManyStatement(table, rows, returning, context) {
         values: context.values,
     };
 }
-function compileUpsertStatement(statement, context) {
-    let insertColumns = Object.keys(statement.values);
-    let conflictTarget = statement.conflictTarget ?? [...getTablePrimaryKey(statement.table)];
+function compileUpsertOperation(operation, context) {
+    let insertColumns = Object.keys(operation.values);
+    let conflictTarget = operation.conflictTarget ?? [...getTablePrimaryKey(operation.table)];
     if (insertColumns.length === 0) {
         throw new Error('upsert requires at least one value');
     }
     let quotedInsertColumns = insertColumns.map((column) => quotePath(column));
-    let insertPlaceholders = insertColumns.map((column) => pushValue(context, statement.values[column]));
-    let updateValues = statement.update ?? statement.values;
+    let insertPlaceholders = insertColumns.map((column) => pushValue(context, operation.values[column]));
+    let updateValues = operation.update ?? operation.values;
     let updateColumns = Object.keys(updateValues);
     let onConflictClause = '';
     if (updateColumns.length === 0) {
@@ -166,18 +167,18 @@ function compileUpsertStatement(statement, context) {
     }
     return {
         text: 'insert into ' +
-            quotePath(getTableName(statement.table)) +
+            quotePath(getTableName(operation.table)) +
             ' (' +
             quotedInsertColumns.join(', ') +
             ') values (' +
             insertPlaceholders.join(', ') +
             ')' +
             onConflictClause +
-            compileReturningClause(statement.returning),
+            compileReturningClause(operation.returning),
         values: context.values,
     };
 }
-function compileRawStatement(statement) {
+function compileRawOperation(statement) {
     if (!statement.text.includes('?')) {
         return {
             text: statement.text,
@@ -344,49 +345,18 @@ function compileComparisonValue(predicate, context) {
     return pushValue(context, predicate.value);
 }
 function normalizeJoinType(type) {
-    if (type === 'left') {
-        return 'left';
-    }
-    if (type === 'right') {
-        return 'right';
-    }
-    return 'inner';
+    return normalizeJoinTypeHelper(type);
 }
 function quoteIdentifier(value) {
     return '"' + value.replace(/"/g, '""') + '"';
 }
 function quotePath(path) {
-    if (path === '*') {
-        return '*';
-    }
-    let segments = path.split('.');
-    return segments
-        .map((segment) => {
-        if (segment === '*') {
-            return '*';
-        }
-        return quoteIdentifier(segment);
-    })
-        .join('.');
+    return quotePathHelper(path, quoteIdentifier);
 }
 function pushValue(context, value) {
     context.values.push(value);
     return '$' + String(context.values.length);
 }
 function collectColumns(rows) {
-    let columns = [];
-    let seen = new Set();
-    for (let row of rows) {
-        for (let key in row) {
-            if (!Object.prototype.hasOwnProperty.call(row, key)) {
-                continue;
-            }
-            if (seen.has(key)) {
-                continue;
-            }
-            seen.add(key);
-            columns.push(key);
-        }
-    }
-    return columns;
+    return collectColumnsHelper(rows);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remix-run/data-table-postgres",
-  "version": "0.1.0",
-  "description": "PostgreSQL adapter for @remix-run/data-table",
+  "version": "0.2.0",
+  "description": "PostgreSQL adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -31,11 +31,10 @@
     "@types/pg": "^8.15.6",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
     "pg": "^8.16.3",
-    "@remix-run/data-schema": "0.1.0",
-    "@remix-run/data-table": "0.1.0"
+    "@remix-run/data-table": "0.2.0"
   },
   "dependencies": {
-    "@remix-run/data-table": "^0.1.0"
+    "@remix-run/data-table": "^0.2.0"
   },
   "peerDependencies": {
     "pg": "^8.16.3"
@@ -55,8 +54,8 @@
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "clean": "git clean -fdX",
-    "test": "node --disable-warning=ExperimentalWarning --test",
-    "test:coverage": "node --disable-warning=ExperimentalWarning --experimental-test-coverage --test-coverage-include='src/**/*.ts' --test-coverage-lines=90 --test-coverage-branches=90 --test-coverage-functions=90 --test ./src/lib/adapter.test.ts ./src/lib/sql-compiler.test.ts",
+    "test": "node --test",
+    "test:coverage": "node --experimental-test-coverage --test-coverage-include='src/**/*.ts' --test-coverage-lines=90 --test-coverage-branches=90 --test-coverage-functions=90 --test ./src/lib/adapter.test.ts ./src/lib/sql-compiler.test.ts",
     "typecheck": "tsgo --noEmit"
   }
 }

package/src/index.ts

@@ -1,8 +1,2 @@
-export type {
-  PostgresDatabaseAdapterOptions,
-  PostgresDatabaseClient,
-  PostgresDatabasePool,
-  PostgresQueryResult,
-  PostgresTransactionClient,
-} from './lib/adapter.ts'
+export type { PostgresDatabaseAdapterOptions } from './lib/adapter.ts'
 export { createPostgresDatabaseAdapter, PostgresDatabaseAdapter } from './lib/adapter.ts'