@squiz/db-lib 1.71.2 → 1.71.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/db-lib",
-  "version": "1.71.2",
+  "version": "1.71.3",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -8,7 +8,7 @@
     "access": "public"
   },
   "scripts": {
-    "compile": "node build.js && tsc",
+    "compile": "tsc -b",
     "test": "jest -c jest.config.ts --testMatch=\"**/*.spec.ts\" --testMatch=\"!**/*.integration.spec.ts\" --passWithNoTests",
     "test:integration": "jest --testMatch=\"**/*.integration.spec.ts\"",
     "test:update-snapshots": "jest -c jest.config.ts --updateSnapshot",
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@types/jest": "28.1.8",
     "@types/node": "20.12.4",
-    "@types/pg": "8.6.6",
+    "@types/pg": "^8.11.8",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "4.0.0",
     "eslint": "8.33.0",
@@ -36,9 +36,9 @@
     "@aws-sdk/client-secrets-manager": "3.651.1",
     "@aws-sdk/lib-dynamodb": "^3.651.1",
     "@opentelemetry/api": "^1.6.0",
-    "@squiz/dx-common-lib": "^1.66.4",
+    "@squiz/dx-common-lib": "^1.68.3",
     "@squiz/dx-logger-lib": "^1.64.0",
     "dotenv": "16.0.3",
-    "pg": "8.9.0"
+    "pg": "^8.12.0"
   }
 }

package/src/AbstractRepository.ts

@@ -1,4 +1,4 @@
-import { PoolClient, Pool } from 'pg';
+import { PoolClient, Pool, escapeIdentifier } from 'pg';
 import { Repositories } from './Repositories';
 import { InvalidUpdateValueError } from '@squiz/dx-common-lib';
 
@@ -56,19 +56,29 @@ export abstract class AbstractRepository<SHAPE extends object, DATA_CLASS extend
     return await this.pool.connect();
   }
 
+  private sanitiseValue(value: Partial<SHAPE>) {
+    const sanitisedValue = Object.entries(value)
+      .map(([key, value]) => [this.modelPropertyToSqlColumn[key as keyof SHAPE], value] as const)
+      .filter(([column, _v]) => !!column);
+
+    const columns = sanitisedValue.map(([column]) => escapeIdentifier(column));
+    const bindingParams = sanitisedValue.map((_, index) => `$${index + 1}`);
+    const values = sanitisedValue.map(([_column, value]) => value);
+
+    return {
+      columns,
+      bindingParams,
+      values,
+    };
+  }
+
   async create(value: SHAPE, transactionClient: PoolClient | null = null): Promise<SHAPE> {
     const valueAsClass = new this.classRef(value as Record<string, unknown>);
-    const columns = Object.keys(valueAsClass)
-      .map((a) => `"${this.modelPropertyToSqlColumn[a as keyof SHAPE]}"`)
-      .join(', ');
-
-    const values = Object.values(valueAsClass)
-      .map((a, index) => `$${index + 1}`)
-      .join(', ');
+    const { columns, bindingParams, values } = this.sanitiseValue(valueAsClass);
 
     const result = await this.executeQuery(
-      `INSERT INTO ${this.tableName} (${columns}) VALUES (${values}) RETURNING *`,
-      Object.values(valueAsClass),
+      `INSERT INTO ${this.tableName} (${columns.join(', ')}) VALUES (${bindingParams.join(', ')}) RETURNING *`,
+      values,
       transactionClient,
     );
 
@@ -84,20 +94,16 @@ export abstract class AbstractRepository<SHAPE extends object, DATA_CLASS extend
       throw new InvalidUpdateValueError('Failed updating the repository, update values cannot be empty');
     }
     const whereValues = Object.values(where);
-    const newValues = Object.values(newValue);
-
-    const setString = Object.keys(newValue)
-      .map((a, index) => `"${this.modelPropertyToSqlColumn[a as keyof SHAPE]}" = $${index + 1}`)
-      .join(', ');
-
-    const whereString = this.createWhereStringFromPartialModel(where, newValues.length);
+    const newValues = this.sanitiseValue(newValue);
+    const setValues = newValues.columns.map((c, i) => `${c} = ${newValues.bindingParams[i]}`);
+    const whereString = this.createWhereStringFromPartialModel(where, setValues.length);
 
     const result = await this.executeQuery(
       `UPDATE ${this.tableName} 
-        SET ${setString} 
+        SET ${setValues.join(', ')} 
         WHERE ${whereString}
         RETURNING *`,
-      [...Object.values(newValues), ...Object.values(whereValues)],
+      [...newValues.values, ...whereValues],
       transactionClient,
     );
 
@@ -112,7 +118,7 @@ export abstract class AbstractRepository<SHAPE extends object, DATA_CLASS extend
 
       const result = await client.query(`DELETE FROM ${this.tableName} WHERE ${whereString}`, Object.values(where));
 
-      return result.rowCount;
+      return result.rowCount ?? 0;
     } finally {
       if (client && !transactionClient) {
         client.release();

package/src/dynamodb/AbstractDynamoDbRepository.ts

@@ -191,7 +191,7 @@ export abstract class AbstractDynamoDbRepository<SHAPE extends object, DATA_CLAS
       updateExpression.push(`${propName} = ${propValue}`);
       expressionAttributeNames[propName] = modelProperty;
 
-      expressionAttributeValues[propValue] = newValue[modelProperty as keyof SHAPE];
+      expressionAttributeValues[propValue] = newValue[modelProperty as keyof SHAPE] ?? null;
     }
 
     const updateCommandInput = {

package/src/dynamodb/getDynamoDbOptions.ts

@@ -4,6 +4,6 @@ export const getDynamoDbOptions = (awsRegion: string, nodeEnv: 'production' | 'd
   }
   return {
     credentials: { accessKeyId: 'key', secretAccessKey: 'key' },
-    endpoint: process.env.CI ? 'http://dynamodb-local:8000' : 'http://localhost:8000',
+    endpoint: process.env.CI ? 'http://dynamodb-local:8000' : process.env.DYNAMO_DB_HOST ?? 'http://localhost:8000',
   };
 };

package/tsconfig.json

@@ -3,9 +3,12 @@
   "compilerOptions": {
     "outDir": "lib/",
     "resolveJsonModule": false,
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "composite": true,
-    "emitDeclarationOnly": true,
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "declaration": true,
+    "declarationMap": true
   },
   "references": [
     {