Added SQLite exports for Dumbo

Author: oskardudycz

src/packages/dumbo/src/sqlite3.ts

@@ -1,2 +1,3 @@
+export * from './core';
 export * from './storage/sqlite/core';
 export * from './storage/sqlite/sqlite3';

src/packages/dumbo/src/storage/postgresql/pg/index.ts

@@ -15,11 +15,7 @@ export type PostgresPoolOptions = DumboOptions<NodePostgresConnector> &
   NodePostgresPoolOptions;
 export const postgresPool = nodePostgresPool;
 
-export const connectionPool = <PoolOptionsType extends DumboOptions>(
-  options: PoolOptionsType,
-) =>
-  // TODO: this should have the pattern matching and verification
-  postgresPool(options as unknown as PostgresPoolOptions);
+export const connectionPool = postgresPool;
 
 export const dumbo = <
   DumboOptionsType extends PostgresPoolOptions = PostgresPoolOptions,

src/packages/dumbo/src/storage/sqlite/core/connections/index.ts

@@ -62,9 +62,11 @@ export type SQLitePoolClientConnection<
   ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
 > = Connection<ConnectorType, SQLitePoolClient>;
 
-export type SQLiteConnection =
-  | SQLiteClientConnection
-  | SQLitePoolClientConnection;
+export type SQLiteConnection<
+  ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
+> =
+  | SQLiteClientConnection<ConnectorType>
+  | SQLitePoolClientConnection<ConnectorType>;
 
 export const sqliteClientConnection = <
   ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,

src/packages/dumbo/src/storage/sqlite/core/index.ts

@@ -1,4 +1,5 @@
-import type { ConnectorType } from '../../..';
+import { getDriverName, type ConnectorType } from '../../..';
+import type { SQLiteClientFactory } from './connections';
 
 export * from './connections';
 export * from './execute';
@@ -10,3 +11,23 @@ export const SQLiteConnector = 'SQLite';
 
 export type SQLiteConnectorType<DriverName extends string = string> =
   ConnectorType<SQLiteConnector, DriverName>;
+
+export type SQLiteDatabaseType = 'SQLite';
+
+export const sqliteClientProvider = async <
+  ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
+>(
+  connector: ConnectorType,
+): Promise<SQLiteClientFactory> => {
+  const driverName = getDriverName(connector);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const driverModule = await import(`../${driverName.toLowerCase()}`);
+
+  if (!('sqliteClient' in driverModule))
+    throw new Error(
+      `The connector module "${connector}" does not export a sqliteClient`,
+    );
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+  return driverModule.sqliteClient as SQLiteClientFactory;
+};

src/packages/dumbo/src/storage/sqlite/core/pool/pool.ts

@@ -1,25 +1,34 @@
 import {
   InMemorySQLiteDatabase,
+  sqliteClientProvider,
   sqliteConnection,
   type SQLiteClient,
   type SQLiteClientConnection,
   type SQLiteConnectorType,
   type SQLitePoolClientConnection,
 } from '..';
-import { sqliteClientProvider } from '../..';
 import {
   createConnectionPool,
   JSONSerializer,
   type ConnectionPool,
 } from '../../../../core';
 
-export type SQLiteAmbientClientPool = ConnectionPool<SQLiteClientConnection>;
+export type SQLiteAmbientClientPool<
+  ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
+> = ConnectionPool<SQLiteClientConnection<ConnectorType>>;
 
-export type SQLiteAmbientConnectionPool = ConnectionPool<
-  SQLitePoolClientConnection | SQLiteClientConnection
+export type SQLiteAmbientConnectionPool<
+  ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
+> = ConnectionPool<
+  | SQLitePoolClientConnection<ConnectorType>
+  | SQLiteClientConnection<ConnectorType>
 >;
 
-export type SQLitePool = SQLiteAmbientClientPool | SQLiteAmbientConnectionPool;
+export type SQLitePool<
+  ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
+> =
+  | SQLiteAmbientClientPool<ConnectorType>
+  | SQLiteAmbientConnectionPool<ConnectorType>;
 
 // TODO: Add connection pool handling
 
@@ -30,7 +39,7 @@ export const sqliteAmbientConnectionPool = <
   connection:
     | SQLitePoolClientConnection<ConnectorType>
     | SQLiteClientConnection<ConnectorType>;
-}): SQLiteAmbientConnectionPool => {
+}): SQLiteAmbientConnectionPool<ConnectorType> => {
   const { connection, connector: connectorType } = options;
 
   return createConnectionPool({
@@ -48,7 +57,7 @@ export const sqliteSingletonClientPool = <
   connector: ConnectorType;
   fileName: string;
   database?: string | undefined;
-}): SQLiteAmbientClientPool => {
+}): SQLiteAmbientClientPool<ConnectorType> => {
   const { connector, fileName } = options;
   let connection: SQLiteClientConnection | undefined = undefined;
 
@@ -86,7 +95,7 @@ export const sqliteAlwaysNewClientPool = <
   connector: ConnectorType;
   fileName: string;
   database?: string | undefined;
-}): SQLiteAmbientClientPool => {
+}): SQLiteAmbientClientPool<ConnectorType> => {
   const { connector, fileName } = options;
 
   return createConnectionPool({
@@ -111,7 +120,7 @@ export const sqliteAmbientClientPool = <
 >(options: {
   connector: ConnectorType;
   client: SQLiteClient;
-}): SQLiteAmbientClientPool => {
+}): SQLiteAmbientClientPool<ConnectorType> => {
   const { client, connector } = options;
 
   const getConnection = () => {
@@ -182,12 +191,16 @@ export type SQLitePoolOptions<
 
 export function sqlitePool<
   ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
->(options: SQLitePoolNotPooledOptions<ConnectorType>): SQLiteAmbientClientPool;
+>(
+  options: SQLitePoolNotPooledOptions<ConnectorType>,
+): SQLiteAmbientClientPool<ConnectorType>;
 export function sqlitePool<
   ConnectorType extends SQLiteConnectorType = SQLiteConnectorType,
 >(
   options: SQLitePoolOptions<ConnectorType>,
-): SQLiteAmbientClientPool | SQLiteAmbientConnectionPool {
+):
+  | SQLiteAmbientClientPool<ConnectorType>
+  | SQLiteAmbientConnectionPool<ConnectorType> {
   const { fileName, connector } = options;
 
   // TODO: Handle dates and bigints

src/packages/dumbo/src/storage/sqlite/index.ts

@@ -1,4 +1,23 @@
 export * from './connections';
-import { sqlite3Client as sqliteClient } from './connections';
+import type { Dumbo } from '../../../core';
+import {
+  sqlitePool,
+  type SQLiteConnection,
+  type SQLitePoolOptions,
+} from '../core';
+import {
+  sqlite3Client as sqliteClient,
+  type SQLite3Connector,
+} from './connections';
 
 export { sqliteClient };
+
+export const connectionPool = sqlitePool;
+
+export const dumbo = <
+  DumboOptionsType extends
+    SQLitePoolOptions<SQLite3Connector> = SQLitePoolOptions<SQLite3Connector>,
+>(
+  options: DumboOptionsType,
+): Dumbo<SQLite3Connector, SQLiteConnection<SQLite3Connector>> =>
+  sqlitePool(options);