@nymphjs/driver-postgresql 1.0.0-beta.81 → 1.0.0-beta.83

package/src/PostgreSQLDriver.ts

@@ -1,5 +1,7 @@
-import { Pool, PoolClient, PoolConfig, QueryResult } from 'pg';
+import pg from 'pg';
+import type { Pool, PoolClient, PoolConfig, QueryResult } from 'pg';
 import format from 'pg-format';
+import Cursor from 'pg-cursor';
 import {
   NymphDriver,
   type EntityConstructor,
@@ -22,7 +24,7 @@ import { makeTableSuffix } from '@nymphjs/guid';
 import {
   PostgreSQLDriverConfig,
   PostgreSQLDriverConfigDefaults as defaults,
-} from './conf';
+} from './conf/index.js';
 
 type PostgreSQLDriverConnection = {
   client: PoolClient;
@@ -145,8 +147,8 @@ export default class PostgreSQLDriver extends NymphDriver {
         err
           ? reject(err)
           : client
-          ? resolve({ client, done })
-          : reject('No client returned from connect.'),
+            ? resolve({ client, done })
+            : reject('No client returned from connect.'),
       ),
     );
   }
@@ -166,8 +168,8 @@ export default class PostgreSQLDriver extends NymphDriver {
               err
                 ? reject(err)
                 : client
-                ? resolve({ client, done })
-                : reject('No client returned from connect.'),
+                  ? resolve({ client, done })
+                  : reject('No client returned from connect.'),
             ),
         );
         await new Promise((resolve, reject) =>
@@ -187,7 +189,7 @@ export default class PostgreSQLDriver extends NymphDriver {
     // Connecting, selecting database
     if (!this.connected) {
       try {
-        this.link = new Pool(this.postgresqlConfig);
+        this.link = new pg.Pool(this.postgresqlConfig);
         this.connected = true;
       } catch (e: any) {
         if (
@@ -645,7 +647,7 @@ export default class PostgreSQLDriver extends NymphDriver {
     }
   }
 
-  private queryIter(
+  private queryArray(
     query: string,
     {
       etypes = [],
@@ -682,6 +684,54 @@ export default class PostgreSQLDriver extends NymphDriver {
     );
   }
 
+  private async queryIter(
+    query: string,
+    {
+      etypes = [],
+      params = {},
+    }: {
+      etypes?: string[];
+      params?: { [k: string]: any };
+    } = {},
+  ) {
+    const { query: newQuery, params: newParams } = this.translateQuery(
+      query,
+      params,
+    );
+    const that = this;
+
+    return this.query(
+      async function* (): AsyncGenerator<any, void, false | undefined> {
+        const transaction = !!that.transaction?.connection;
+        const connection = await that.getConnection();
+        const cursor = new Cursor(newQuery, newParams);
+        const iter = connection.client.query(cursor);
+
+        while (true) {
+          const rows = await iter.read(100);
+
+          if (!rows.length) {
+            await new Promise<void>((resolve) => {
+              iter.close(() => {
+                if (!transaction) {
+                  connection.done();
+                }
+                resolve();
+              });
+            });
+            return;
+          }
+
+          for (let row of rows) {
+            yield row;
+          }
+        }
+      },
+      `${query} -- ${JSON.stringify(params)}`,
+      etypes,
+    );
+  }
+
   private queryGet(
     query: string,
     {
@@ -911,7 +961,7 @@ export default class PostgreSQLDriver extends NymphDriver {
         `${this.prefix}uids`,
       )} ORDER BY "name";`,
     );
-    for (const uid of uids) {
+    for await (const uid of uids) {
       if (yield { type: 'uid', content: `<${uid.name}>[${uid.cur_uid}]\n` }) {
         return;
       }
@@ -933,7 +983,7 @@ export default class PostgreSQLDriver extends NymphDriver {
     }
 
     // Get the etypes.
-    const tables = await this.queryIter(
+    const tables = await this.queryArray(
       'SELECT "table_name" AS "table_name" FROM "information_schema"."tables" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name" LIKE @prefix;',
       {
         params: {
@@ -949,17 +999,15 @@ export default class PostgreSQLDriver extends NymphDriver {
 
     for (const etype of etypes) {
       // Export entities.
-      const dataIterator = (
-        await this.queryIter(
-          `SELECT encode(e."guid", 'hex') AS "guid", e."tags", e."cdate", e."mdate", d."name", d."value", d."json", d."string", d."number"
+      const dataIterator = await this.queryIter(
+        `SELECT encode(e."guid", 'hex') AS "guid", e."tags", e."cdate", e."mdate", d."name", d."value", d."json", d."string", d."number"
           FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} e
           LEFT JOIN ${PostgreSQLDriver.escape(
             `${this.prefix}data_${etype}`,
           )} d ON e."guid"=d."guid"
           ORDER BY e."guid";`,
-        )
-      )[Symbol.iterator]();
-      let datum = dataIterator.next();
+      );
+      let datum = await dataIterator.next();
       while (!datum.done) {
         const guid = datum.value.guid;
         const tags = datum.value.tags.filter((tag: string) => tag).join(',');
@@ -977,20 +1025,20 @@ export default class PostgreSQLDriver extends NymphDriver {
               datum.value.value === 'N'
                 ? JSON.stringify(Number(datum.value.number))
                 : datum.value.value === 'S'
-                ? JSON.stringify(
-                    PostgreSQLDriver.unescapeNulls(datum.value.string),
-                  )
-                : datum.value.value === 'J'
-                ? PostgreSQLDriver.unescapeNullSequences(
-                    JSON.stringify(datum.value.json),
-                  )
-                : datum.value.value;
+                  ? JSON.stringify(
+                      PostgreSQLDriver.unescapeNulls(datum.value.string),
+                    )
+                  : datum.value.value === 'J'
+                    ? PostgreSQLDriver.unescapeNullSequences(
+                        JSON.stringify(datum.value.json),
+                      )
+                    : datum.value.value;
             currentEntityExport.push(`\t${datum.value.name}=${value}`);
-            datum = dataIterator.next();
+            datum = await dataIterator.next();
           } while (!datum.done && datum.value.guid === guid);
         } else {
           // Make sure that datum is incremented :)
-          datum = dataIterator.next();
+          datum = await dataIterator.next();
         }
         currentEntityExport.push('');
 
@@ -2039,7 +2087,7 @@ export default class PostgreSQLDriver extends NymphDriver {
       formattedSelectors,
       etype,
     );
-    const result = this.queryIter(query, { etypes, params }).then((val) =>
+    const result = this.queryArray(query, { etypes, params }).then((val) =>
       val[Symbol.iterator](),
     );
     return {
@@ -2087,10 +2135,12 @@ export default class PostgreSQLDriver extends NymphDriver {
           row.value === 'N'
             ? JSON.stringify(Number(row.number))
             : row.value === 'S'
-            ? JSON.stringify(PostgreSQLDriver.unescapeNulls(row.string))
-            : row.value === 'J'
-            ? PostgreSQLDriver.unescapeNullSequences(JSON.stringify(row.json))
-            : row.value,
+              ? JSON.stringify(PostgreSQLDriver.unescapeNulls(row.string))
+              : row.value === 'J'
+                ? PostgreSQLDriver.unescapeNullSequences(
+                    JSON.stringify(row.json),
+                  )
+                : row.value,
       }),
     );
 
@@ -2214,8 +2264,8 @@ export default class PostgreSQLDriver extends NymphDriver {
           typeof uvalue === 'number'
             ? 'N'
             : typeof uvalue === 'string'
-            ? 'S'
-            : 'J';
+              ? 'S'
+              : 'J';
         const jsonValue =
           storageValue === 'J'
             ? PostgreSQLDriver.escapeNullSequences(value)
@@ -2443,8 +2493,8 @@ export default class PostgreSQLDriver extends NymphDriver {
           typeof value === 'number'
             ? 'N'
             : typeof value === 'string'
-            ? 'S'
-            : 'J';
+              ? 'S'
+              : 'J';
         const jsonValue =
           storageValue === 'J'
             ? PostgreSQLDriver.escapeNullSequences(svalue)

package/src/conf/defaults.ts

@@ -1,4 +1,4 @@
-import { PostgreSQLDriverConfig } from './d';
+import { PostgreSQLDriverConfig } from './d.js';
 
 export default {
   host: 'localhost',

package/src/conf/index.ts

@@ -1,4 +1,4 @@
-export { PostgreSQLDriverConfig } from './d';
+export { PostgreSQLDriverConfig } from './d.js';
 
-import defaults from './defaults';
+import defaults from './defaults.js';
 export { defaults as PostgreSQLDriverConfigDefaults };

package/src/index.ts

@@ -1,5 +1,5 @@
-export * from './conf';
+export * from './conf/index.js';
 
-import PostgreSQLDriver from './PostgreSQLDriver';
+import PostgreSQLDriver from './PostgreSQLDriver.js';
 export { PostgreSQLDriver };
 export default PostgreSQLDriver;

package/tsconfig.json

@@ -2,7 +2,9 @@
   "extends": "@tsconfig/recommended/tsconfig.json",
 
   "compilerOptions": {
-    "lib": ["ES2023"],
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "lib": ["ES2022"],
     "target": "ES2022",
     "noImplicitAny": true,
     "removeComments": false,