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

package/dist/lib/sql-compiler.js

@@ -1,39 +1,40 @@
 import { getTableName, getTablePrimaryKey } from '@remix-run/data-table';
-export function compileMysqlStatement(statement) {
-    if (statement.kind === 'raw') {
+import { collectColumns as collectColumnsHelper, normalizeJoinType as normalizeJoinTypeHelper, quotePath as quotePathHelper, } from '@remix-run/data-table/sql-helpers';
+export function compileMysqlOperation(operation) {
+    if (operation.kind === 'raw') {
         return {
-            text: statement.sql.text,
-            values: [...statement.sql.values],
+            text: operation.sql.text,
+            values: [...operation.sql.values],
         };
     }
     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(', ');
         }
         return {
             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),
             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') +
@@ -44,39 +45,39 @@ export function compileMysqlStatement(statement) {
             values: context.values,
         };
     }
-    if (statement.kind === 'insert') {
-        return compileInsertStatement(statement.table, statement.values, context);
+    if (operation.kind === 'insert') {
+        return compileInsertOperation(operation.table, operation.values, context);
     }
-    if (statement.kind === 'insertMany') {
-        return compileInsertManyStatement(statement.table, statement.values, context);
+    if (operation.kind === 'insertMany') {
+        return compileInsertManyOperation(operation.table, operation.values, context);
     }
-    if (statement.kind === 'update') {
-        let columns = Object.keys(statement.changes);
+    if (operation.kind === 'update') {
+        let columns = Object.keys(operation.changes);
         return {
             text: 'update ' +
-                quotePath(getTableName(statement.table)) +
+                quotePath(getTableName(operation.table)) +
                 ' set ' +
                 columns
-                    .map((column) => quotePath(column) + ' = ' + pushValue(context, statement.changes[column]))
+                    .map((column) => quotePath(column) + ' = ' + pushValue(context, operation.changes[column]))
                     .join(', ') +
-                compileWhereClause(statement.where, context),
+                compileWhereClause(operation.where, context),
             values: context.values,
         };
     }
-    if (statement.kind === 'delete') {
+    if (operation.kind === 'delete') {
         return {
             text: 'delete from ' +
-                quotePath(getTableName(statement.table)) +
-                compileWhereClause(statement.where, context),
+                quotePath(getTableName(operation.table)) +
+                compileWhereClause(operation.where, context),
             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, context) {
+function compileInsertOperation(table, values, context) {
     let columns = Object.keys(values);
     if (columns.length === 0) {
         return {
@@ -95,7 +96,7 @@ function compileInsertStatement(table, values, context) {
         values: context.values,
     };
 }
-function compileInsertManyStatement(table, rows, context) {
+function compileInsertManyOperation(table, rows, context) {
     if (rows.length === 0) {
         return {
             text: 'select 0 where 1 = 0',
@@ -127,14 +128,14 @@ function compileInsertManyStatement(table, rows, context) {
         values: context.values,
     };
 }
-function compileUpsertStatement(statement, context) {
-    let insertColumns = Object.keys(statement.values);
+function compileUpsertOperation(operation, context) {
+    let insertColumns = Object.keys(operation.values);
     if (insertColumns.length === 0) {
         throw new Error('upsert requires at least one value');
     }
-    let updateValues = statement.update ?? statement.values;
+    let updateValues = operation.update ?? operation.values;
     let updateColumns = Object.keys(updateValues);
-    let fallbackNoopColumn = getTablePrimaryKey(statement.table)[0];
+    let fallbackNoopColumn = getTablePrimaryKey(operation.table)[0];
     let onDuplicate = updateColumns.length > 0
         ? updateColumns
             .map((column) => quotePath(column) + ' = ' + pushValue(context, updateValues[column]))
@@ -142,11 +143,11 @@ function compileUpsertStatement(statement, context) {
         : quotePath(fallbackNoopColumn) + ' = ' + quotePath(fallbackNoopColumn);
     return {
         text: 'insert into ' +
-            quotePath(getTableName(statement.table)) +
+            quotePath(getTableName(operation.table)) +
             ' (' +
             insertColumns.map((column) => quotePath(column)).join(', ') +
             ') values (' +
-            insertColumns.map((column) => pushValue(context, statement.values[column])).join(', ') +
+            insertColumns.map((column) => pushValue(context, operation.values[column])).join(', ') +
             ') on duplicate key update ' +
             onDuplicate,
         values: context.values,
@@ -291,49 +292,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 '*';
-    }
-    return path
-        .split('.')
-        .map((segment) => {
-        if (segment === '*') {
-            return '*';
-        }
-        return quoteIdentifier(segment);
-    })
-        .join('.');
+    return quotePathHelper(path, quoteIdentifier);
 }
 function pushValue(context, value) {
     context.values.push(value);
     return '?';
 }
 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-mysql",
-  "version": "0.1.0",
-  "description": "MySQL adapter for @remix-run/data-table",
+  "version": "0.2.0",
+  "description": "MySQL adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
   "repository": {
@@ -30,11 +30,10 @@
     "@types/node": "^24.6.0",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
     "mysql2": "^3.15.3",
-    "@remix-run/data-table": "0.1.0",
-    "@remix-run/data-schema": "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": {
     "mysql2": "^3.15.3"
@@ -54,8 +53,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,9 +1,2 @@
-export type {
-  MysqlDatabaseAdapterOptions,
-  MysqlDatabaseConnection,
-  MysqlDatabasePool,
-  MysqlQueryResponse,
-  MysqlQueryResultHeader,
-  MysqlQueryRows,
-} from './lib/adapter.ts'
+export type { MysqlDatabaseAdapterOptions } from './lib/adapter.ts'
 export { createMysqlDatabaseAdapter, MysqlDatabaseAdapter } from './lib/adapter.ts'