@prairielearn/postgres 1.9.4 → 2.0.1

package/src/pool.test.ts

@@ -1,7 +1,8 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import { Writable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
+
+import { use as chaiUse, assert } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import { z, ZodError } from 'zod';
 
 import {
@@ -14,11 +15,10 @@ import {
   callOptionalRow,
   queryCursor,
   queryValidatedCursor,
-} from './default-pool';
-import { makePostgresTestUtils } from './test-utils';
+} from './default-pool.js';
+import { makePostgresTestUtils } from './test-utils.js';
 
-chai.use(chaiAsPromised);
-const { assert } = chai;
+chaiUse(chaiAsPromised);
 
 const postgresTestUtils = makePostgresTestUtils({
   database: 'prairielearn_postgres',
@@ -278,11 +278,11 @@ describe('@prairielearn/postgres', function () {
       const maybeError = await readAllRows().catch((err) => err);
       assert.instanceOf(maybeError, Error);
       assert.match(maybeError.message, /syntax error/);
-      assert.isDefined(maybeError.data);
-      assert.equal(maybeError.data.sql, 'NOT VALID SQL');
-      assert.deepEqual(maybeError.data.sqlParams, { foo: 'bar' });
-      assert.isDefined(maybeError.data.sqlError);
-      assert.equal(maybeError.data.sqlError.severity, 'ERROR');
+      assert.isDefined((maybeError as any).data);
+      assert.equal((maybeError as any).data.sql, 'NOT VALID SQL');
+      assert.deepEqual((maybeError as any).data.sqlParams, { foo: 'bar' });
+      assert.isDefined((maybeError as any).data.sqlError);
+      assert.equal((maybeError as any).data.sqlError.severity, 'ERROR');
     });
   });
 

package/src/pool.ts

@@ -1,12 +1,13 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { Readable, Transform } from 'node:stream';
+import { callbackify } from 'node:util';
+
+import debugfn from 'debug';
 import _ from 'lodash';
+import multipipe from 'multipipe';
 import pg, { QueryResult } from 'pg';
 import Cursor from 'pg-cursor';
-import debugFactory from 'debug';
-import { callbackify } from 'node:util';
-import { AsyncLocalStorage } from 'node:async_hooks';
 import { z } from 'zod';
-import { Readable, Transform } from 'node:stream';
-import multipipe from 'multipipe';
 
 export type QueryParams = Record<string, any> | any[];
 
@@ -15,7 +16,7 @@ export interface CursorIterator<T> {
   stream: (batchSize: number) => NodeJS.ReadWriteStream;
 }
 
-const debug = debugFactory('@prairielearn/postgres');
+const debug = debugfn('@prairielearn/postgres');
 const lastQueryMap = new WeakMap<pg.PoolClient, string>();
 const searchSchemaMap = new WeakMap<pg.PoolClient, string>();
 
@@ -87,9 +88,9 @@ function paramsToArray(
   let paramsArray: any[] = [];
   while ((result = re.exec(remainingSql)) !== null) {
     const v = result[1];
-    if (!_(map).has(v)) {
-      if (!_(params).has(v)) throw new Error(`Missing parameter: ${v}`);
-      if (_.isArray(params[v])) {
+    if (!(v in map)) {
+      if (!(v in params)) throw new Error(`Missing parameter: ${v}`);
+      if (Array.isArray(params[v])) {
         map[v] =
           'ARRAY[' +
           _.map(_.range(nParams + 1, nParams + params[v].length + 1), function (n) {

package/src/test-utils.ts

@@ -1,6 +1,6 @@
 import pg from 'pg';
 
-import * as defaultPool from './default-pool';
+import * as defaultPool from './default-pool.js';
 
 const POSTGRES_USER = 'postgres';
 const POSTGRES_HOST = 'localhost';