Added typing for update queries and extracted dedicated methods

Author: oskardudycz

src/packages/pongo/src/main/typing.ts

@@ -37,11 +37,16 @@ export type PongoFilterOperator<T> = {
   $nin?: T[];
 };
 
+export type $set<T> = Partial<T>;
+export type $unset<T> = { [P in keyof T]?: '' };
+export type $inc<T> = { [P in keyof T]?: number };
+export type $push<T> = { [P in keyof T]?: T[P] };
+
 export type PongoUpdate<T> = {
   $set?: Partial<T>;
-  $unset?: { [P in keyof T]?: '' };
-  $inc?: { [P in keyof T]?: number };
-  $push?: { [P in keyof T]?: T[P] };
+  $unset?: $unset<T>;
+  $inc?: $inc<T>;
+  $push?: $push<T>;
 };
 
 export interface PongoInsertOneResult {

src/packages/pongo/src/postgres/client.ts

@@ -13,7 +13,7 @@ import { executeSQL } from './execute';
 import { constructFilterQuery } from './filter';
 import { endPool, getPool } from './pool';
 import { sql } from './sql';
-import { constructUpdateQuery } from './update';
+import { buildUpdateQuery } from './update';
 
 export const postgresClient = (
   connectionString: string,
@@ -69,7 +69,7 @@ export const postgresCollection = <T>(
       await createCollection;
 
       const filterQuery = constructFilterQuery(filter);
-      const updateQuery = constructUpdateQuery(update);
+      const updateQuery = buildUpdateQuery(update);
 
       const result = await executeSQL(
         pool,

src/packages/pongo/src/postgres/update/index.ts

@@ -1,49 +1,65 @@
-import format from 'pg-format';
-import type { PongoUpdate } from '../../main';
-
-export const constructUpdateQuery = <T>(update: PongoUpdate<T>): string => {
-  let updateQuery = 'data';
-
-  if ('$set' in update) {
-    const setUpdate = update.$set!;
-    updateQuery = format(
-      'jsonb_set(%s, %L, data || %L)',
-      updateQuery,
-      '{}',
-      JSON.stringify(setUpdate),
-    );
-  }
+import type { $inc, $push, $set, $unset, PongoUpdate } from '../../main';
+import { sql, type SQL } from '../sql';
 
-  if ('$unset' in update) {
-    const unsetUpdate = Object.keys(update.$unset!);
-    updateQuery = format('%s - %L', updateQuery, unsetUpdate.join(', '));
-  }
+export const buildUpdateQuery = <T>(update: PongoUpdate<T>): SQL => {
+  let updateQuery = sql('data');
 
-  if ('$inc' in update) {
-    const incUpdate = update.$inc!;
-    for (const [key, value] of Object.entries(incUpdate)) {
-      updateQuery = format(
-        "jsonb_set(%s, '{%s}', to_jsonb((data->>'%s')::numeric + %L))",
-        updateQuery,
-        key,
-        key,
-        value,
-      );
-    }
-  }
+  if ('$set' in update && update.$set)
+    updateQuery = buildSetQuery(update.$set, updateQuery);
 
-  if ('$push' in update) {
-    const pushUpdate = update.$push!;
-    for (const [key, value] of Object.entries(pushUpdate)) {
-      updateQuery = format(
-        "jsonb_set(%s, '{%s}', (COALESCE(data->'%s', '[]'::jsonb) || '[%s]'::jsonb))",
-        updateQuery,
-        key,
-        key,
-        JSON.stringify(value),
-      );
-    }
-  }
+  if ('$unset' in update && update.$unset)
+    updateQuery = buildUnsetQuery(update.$unset, updateQuery);
+
+  if ('$inc' in update && update.$inc)
+    updateQuery = buildIncQuery(update.$inc, updateQuery);
+
+  if ('$push' in update && update.$push)
+    updateQuery = buildPushQuery(update.$push, updateQuery);
 
   return updateQuery;
 };
+
+export const buildSetQuery = <T>(set: $set<T>, currentUpdateQuery: SQL): SQL =>
+  sql(
+    'jsonb_set(%s, %L, data || %L)',
+    currentUpdateQuery,
+    '{}',
+    JSON.stringify(set),
+  );
+
+export const buildUnsetQuery = <T>(
+  unset: $unset<T>,
+  currentUpdateQuery: SQL,
+): SQL => sql('%s - %L', currentUpdateQuery, Object.keys(unset).join(', '));
+
+export const buildIncQuery = <T>(
+  inc: $inc<T>,
+  currentUpdateQuery: SQL,
+): SQL => {
+  for (const [key, value] of Object.entries(inc)) {
+    currentUpdateQuery = sql(
+      "jsonb_set(%s, '{%s}', to_jsonb((data->>'%s')::numeric + %L))",
+      currentUpdateQuery,
+      key,
+      key,
+      value,
+    );
+  }
+  return currentUpdateQuery;
+};
+
+export const buildPushQuery = <T>(
+  push: $push<T>,
+  currentUpdateQuery: SQL,
+): SQL => {
+  for (const [key, value] of Object.entries(push)) {
+    currentUpdateQuery = sql(
+      "jsonb_set(%s, '{%s}', (COALESCE(data->'%s', '[]'::jsonb) || '[%s]'::jsonb))",
+      currentUpdateQuery,
+      key,
+      key,
+      JSON.stringify(value),
+    );
+  }
+  return currentUpdateQuery;
+};