@stonyx/orm 0.3.2-alpha.11 → 0.3.2-alpha.13

package/README.md

@@ -100,7 +100,7 @@ export default {
       migrationsTable: '__migrations',
     } : undefined,
     dynamodb: DYNAMODB_REGION ? {
-      region: DYNAMODB_REGION ?? 'us-east-1',
+      region: DYNAMODB_REGION,
       endpoint: DYNAMODB_ENDPOINT,          // optional, for DynamoDB Local
       tablePrefix: DYNAMODB_TABLE_PREFIX,   // optional table name prefix
     } : undefined,

package/dist/dynamodb/connection.d.ts

@@ -12,10 +12,12 @@ export interface DynamoDBConfig {
 export type DocumentClient = {
     send(command: unknown): Promise<unknown>;
 };
-export type DocumentClientConstructor = new (options: {
-    client: unknown;
-}) => DocumentClient;
-export type DynamoDBClientConstructor = new (options: unknown) => unknown;
+export type DynamoDBClientConstructor = new (options: unknown) => {
+    config: unknown;
+};
+export type DocumentClientFromFn = {
+    from(client: unknown): DocumentClient;
+};
 /**
  * Create a DynamoDBDocumentClient from the given config.
  * Uses dynamic import so @aws-sdk/* are optional peer deps.

package/dist/dynamodb/connection.js

@@ -9,15 +9,15 @@
  * Uses dynamic import so @aws-sdk/* are optional peer deps.
  */
 export async function createDocumentClient(dbConfig) {
-    const { DynamoDB } = await import('@aws-sdk/client-dynamodb');
-    const { DynamoDBDocument } = await import('@aws-sdk/lib-dynamodb');
+    const { DynamoDBClient } = await import('@aws-sdk/client-dynamodb');
+    const { DynamoDBDocumentClient } = await import('@aws-sdk/lib-dynamodb');
     const clientOptions = {};
     if (dbConfig.region)
         clientOptions.region = dbConfig.region;
     if (dbConfig.endpoint)
         clientOptions.endpoint = dbConfig.endpoint;
-    const rawClient = new DynamoDB(clientOptions);
-    return new DynamoDBDocument({ client: rawClient });
+    const rawClient = new DynamoDBClient(clientOptions);
+    return DynamoDBDocumentClient.from(rawClient);
 }
 /**
  * Nullify the document client reference (DynamoDB connections are HTTP-based

package/dist/postgres/connection.d.ts

@@ -6,6 +6,7 @@ interface PgConfig {
     password: string;
     database: string;
     connectionLimit: number;
+    [key: string]: unknown;
 }
 /**
  * Create or return the singleton pg Pool.

package/dist/postgres/connection.js

@@ -7,15 +7,17 @@ export async function getPool(pgConfig, extensions = ['vector']) {
     if (pool)
         return pool;
     const { default: pg } = await import('pg');
+    const { host, port, user, password, database, connectionLimit, migrationsDir, migrationsTable, ...poolOpts } = pgConfig;
     pool = new pg.Pool({
-        host: pgConfig.host,
-        port: pgConfig.port,
-        user: pgConfig.user,
-        password: pgConfig.password,
-        database: pgConfig.database,
-        max: pgConfig.connectionLimit,
+        host,
+        port,
+        user,
+        password,
+        database,
+        max: connectionLimit,
         idleTimeoutMillis: 30000,
         connectionTimeoutMillis: 10000,
+        ...poolOpts,
     });
     // Enable requested PostgreSQL extensions
     for (const ext of extensions) {

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.3.2-alpha.11",
+  "version": "0.3.2-alpha.13",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -103,6 +103,7 @@
   "scripts": {
     "build": "tsc",
     "build:test": "tsc -p tsconfig.test.json",
-    "test": "pnpm build && NODE_ENV=test node --import tsx/esm --import ./test/setup.ts node_modules/qunit/bin/qunit.js 'test/**/*-test.ts'"
+    "test": "pnpm build && NODE_ENV=test node --import tsx/esm --import ./test/setup.ts node_modules/qunit/bin/qunit.js 'test/**/*-test.ts'",
+    "test:dynamodb": "pnpm build && node --import tsx/esm --import ./test/integration/dynamodb/setup.ts node_modules/qunit/bin/qunit.js 'test/integration/dynamodb/**/*-test.ts'"
   }
 }

package/src/dynamodb/connection.ts

@@ -17,27 +17,27 @@ export type DocumentClient = {
   send(command: unknown): Promise<unknown>;
 };
 
-export type DocumentClientConstructor = new (options: { client: unknown }) => DocumentClient;
-export type DynamoDBClientConstructor = new (options: unknown) => unknown;
+export type DynamoDBClientConstructor = new (options: unknown) => { config: unknown };
+export type DocumentClientFromFn = { from(client: unknown): DocumentClient };
 
 /**
  * Create a DynamoDBDocumentClient from the given config.
  * Uses dynamic import so @aws-sdk/* are optional peer deps.
  */
 export async function createDocumentClient(dbConfig: DynamoDBConfig): Promise<DocumentClient> {
-  const { DynamoDB } = await import('@aws-sdk/client-dynamodb' as string) as {
-    DynamoDB: DynamoDBClientConstructor;
+  const { DynamoDBClient } = await import('@aws-sdk/client-dynamodb' as string) as {
+    DynamoDBClient: DynamoDBClientConstructor;
   };
-  const { DynamoDBDocument } = await import('@aws-sdk/lib-dynamodb' as string) as {
-    DynamoDBDocument: DocumentClientConstructor;
+  const { DynamoDBDocumentClient } = await import('@aws-sdk/lib-dynamodb' as string) as {
+    DynamoDBDocumentClient: DocumentClientFromFn;
   };
 
   const clientOptions: Record<string, unknown> = {};
   if (dbConfig.region) clientOptions.region = dbConfig.region;
   if (dbConfig.endpoint) clientOptions.endpoint = dbConfig.endpoint;
 
-  const rawClient = new DynamoDB(clientOptions);
-  return new DynamoDBDocument({ client: rawClient });
+  const rawClient = new DynamoDBClient(clientOptions);
+  return DynamoDBDocumentClient.from(rawClient);
 }
 
 /**

package/src/postgres/connection.ts

@@ -8,6 +8,7 @@ interface PgConfig {
   password: string;
   database: string;
   connectionLimit: number;
+  [key: string]: unknown;
 }
 
 let pool: PgPool | null = null;
@@ -20,15 +21,18 @@ export async function getPool(pgConfig: PgConfig, extensions: string[] = ['vecto
 
   const { default: pg } = await import('pg');
 
+  const { host, port, user, password, database, connectionLimit, migrationsDir, migrationsTable, ...poolOpts } = pgConfig;
+
   pool = new pg.Pool({
-    host: pgConfig.host,
-    port: pgConfig.port,
-    user: pgConfig.user,
-    password: pgConfig.password,
-    database: pgConfig.database,
-    max: pgConfig.connectionLimit,
+    host,
+    port,
+    user,
+    password,
+    database,
+    max: connectionLimit,
     idleTimeoutMillis: 30000,
     connectionTimeoutMillis: 10000,
+    ...poolOpts,
   });
 
   // Enable requested PostgreSQL extensions