Added possibility to use regular database methods on strongly-typed database

Author: oskardudycz

src/packages/pongo/src/core/schema/index.ts

@@ -42,14 +42,17 @@ export type PongoDbWithSchema<
   ConnectorType extends string = string,
 > = CollectionsMap<T> & PongoDb<ConnectorType>;
 
-export type DBsMap<T extends Record<string, PongoDbSchema>> = {
-  [K in keyof T]: CollectionsMap<T[K]['collections']>;
+export type DBsMap<
+  T extends Record<string, PongoDbSchema>,
+  ConnectorType extends string = string,
+> = {
+  [K in keyof T]: CollectionsMap<T[K]['collections']> & PongoDb<ConnectorType>;
 };
 
-export type PongoClientWithSchema<T extends PongoClientSchema> = DBsMap<
-  T['dbs']
-> &
-  PongoClient;
+export type PongoClientWithSchema<
+  T extends PongoClientSchema,
+  ConnectorType extends string = string,
+> = DBsMap<T['dbs'], ConnectorType> & PongoClient;
 
 const pongoCollectionSchema = <T extends PongoDocument>(
   name: string,
@@ -124,7 +127,6 @@ export const proxyPongoDbWithSchema = <
   ) as PongoDbWithSchema<T, ConnectorType>;
 };
 
-// Factory function to create Client instances
 export const proxyClientWithSchema = <
   TypedClientSchema extends PongoClientSchema,
 >(

src/packages/pongo/src/e2e/postgres.e2e.spec.ts

@@ -1147,7 +1147,7 @@ void describe('MongoDB Compatibility Tests', () => {
       }),
     });
 
-    void it('should access collection by name and perform operation', async () => {
+    void it('should access typed collection and perform operation', async () => {
       const typedClient = pongoClient(postgresConnectionString, {
         schema: { definition: schema },
       });
@@ -1171,5 +1171,30 @@ void describe('MongoDB Compatibility Tests', () => {
         await typedClient.close();
       }
     });
+
+    void it('should access collection by name and perform operation', async () => {
+      const typedClient = pongoClient(postgresConnectionString, {
+        schema: { definition: schema },
+      });
+      try {
+        const users = typedClient.database.collection<User>('users');
+
+        const _id = new Date().toISOString();
+        const doc: User = {
+          _id,
+          name: 'Anita',
+          age: 25,
+        };
+        const pongoInsertResult = await users.insertOne(doc);
+        assert(pongoInsertResult.insertedId);
+
+        const pongoDoc = await users.findOne({
+          _id: pongoInsertResult.insertedId,
+        });
+        assert.ok(pongoDoc);
+      } finally {
+        await typedClient.close();
+      }
+    });
   });
 });