@restura/core 0.1.0-alpha.25 → 0.1.0-alpha.26

package/dist/index.d.mts

@@ -126,14 +126,14 @@ interface ActionRowInsertData<T = DynamicObject> extends DatabaseActionData {
     insertId: number;
     insertObject: T;
 }
-interface ActionRowDeleteData extends DatabaseActionData {
-    deletedRow: DynamicObject;
+interface ActionRowDeleteData<T = DynamicObject> extends DatabaseActionData {
+    deletedRow: T;
 }
-interface ActionColumnChangeData extends DatabaseActionData {
+interface ActionColumnChangeData<T = DynamicObject> extends DatabaseActionData {
     tableName: string;
     rowId: number;
-    newData: DynamicObject;
-    oldData: DynamicObject;
+    newData: T;
+    oldData: T;
 }
 interface ActionRowInsertFilter {
     tableName: string;
@@ -158,9 +158,9 @@ type QueryMetadata = RequesterDetails & {
 };
 declare class EventManager {
     private actionHandlers;
-    addRowInsertHandler(onInsert: (data: ActionRowInsertData<unknown>) => Promise<void>, filter?: ActionRowInsertFilter): void;
-    addColumnChangeHandler(onUpdate: (data: ActionColumnChangeData) => Promise<void>, filter: ActionColumnChangeFilter): void;
-    addRowDeleteHandler(onDelete: (data: ActionRowDeleteData) => Promise<void>, filter?: ActionRowDeleteFilter): void;
+    addRowInsertHandler<T extends DynamicObject>(onInsert: (data: ActionRowInsertData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowInsertFilter): void;
+    addColumnChangeHandler<T extends DynamicObject>(onUpdate: (data: ActionColumnChangeData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter: ActionColumnChangeFilter): void;
+    addRowDeleteHandler<T extends DynamicObject>(onDelete: (data: ActionRowDeleteData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowDeleteFilter): void;
     fireActionFromDbTrigger(sqlMutationData: SqlMutationData, result: TriggerResult): Promise<void>;
     private fireInsertActions;
     private fireDeleteActions;
@@ -2564,6 +2564,12 @@ declare class PsqlTransaction extends PsqlConnection {
 }
 
 declare function escapeColumnName(columnName: string | undefined): string;
+/**
+ * Converts a query with question marks to a query with numbered parameters,
+ * however it ignores question marks inside single or double quotes.
+ * @param query PostgreSQL query with question marks
+ * @returns A string with numbered parameters such as $1, $2 in replacement of question marks
+ */
 declare function questionMarksToOrderedParams(query: string): string;
 declare function insertObjectQuery(table: string, obj: DynamicObject): string;
 declare function updateObjectQuery(table: string, obj: DynamicObject, whereStatement: string): string;

package/dist/index.d.ts

@@ -126,14 +126,14 @@ interface ActionRowInsertData<T = DynamicObject> extends DatabaseActionData {
     insertId: number;
     insertObject: T;
 }
-interface ActionRowDeleteData extends DatabaseActionData {
-    deletedRow: DynamicObject;
+interface ActionRowDeleteData<T = DynamicObject> extends DatabaseActionData {
+    deletedRow: T;
 }
-interface ActionColumnChangeData extends DatabaseActionData {
+interface ActionColumnChangeData<T = DynamicObject> extends DatabaseActionData {
     tableName: string;
     rowId: number;
-    newData: DynamicObject;
-    oldData: DynamicObject;
+    newData: T;
+    oldData: T;
 }
 interface ActionRowInsertFilter {
     tableName: string;
@@ -158,9 +158,9 @@ type QueryMetadata = RequesterDetails & {
 };
 declare class EventManager {
     private actionHandlers;
-    addRowInsertHandler(onInsert: (data: ActionRowInsertData<unknown>) => Promise<void>, filter?: ActionRowInsertFilter): void;
-    addColumnChangeHandler(onUpdate: (data: ActionColumnChangeData) => Promise<void>, filter: ActionColumnChangeFilter): void;
-    addRowDeleteHandler(onDelete: (data: ActionRowDeleteData) => Promise<void>, filter?: ActionRowDeleteFilter): void;
+    addRowInsertHandler<T extends DynamicObject>(onInsert: (data: ActionRowInsertData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowInsertFilter): void;
+    addColumnChangeHandler<T extends DynamicObject>(onUpdate: (data: ActionColumnChangeData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter: ActionColumnChangeFilter): void;
+    addRowDeleteHandler<T extends DynamicObject>(onDelete: (data: ActionRowDeleteData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowDeleteFilter): void;
     fireActionFromDbTrigger(sqlMutationData: SqlMutationData, result: TriggerResult): Promise<void>;
     private fireInsertActions;
     private fireDeleteActions;
@@ -2564,6 +2564,12 @@ declare class PsqlTransaction extends PsqlConnection {
 }
 
 declare function escapeColumnName(columnName: string | undefined): string;
+/**
+ * Converts a query with question marks to a query with numbered parameters,
+ * however it ignores question marks inside single or double quotes.
+ * @param query PostgreSQL query with question marks
+ * @returns A string with numbered parameters such as $1, $2 in replacement of question marks
+ */
 declare function questionMarksToOrderedParams(query: string): string;
 declare function insertObjectQuery(table: string, obj: DynamicObject): string;
 declare function updateObjectQuery(table: string, obj: DynamicObject, whereStatement: string): string;

package/dist/index.js

@@ -972,7 +972,7 @@ function resturaGlobalTypesGenerator() {
   return `/** Auto generated file. DO NOT MODIFY **/
 /** This file contains types that may be used in the CustomTypes of Restura **/
 /** For example export interface MyPagedQuery extends Restura.PageQuery { } **/
-	
+
 declare namespace Restura {
 	export type StandardOrderTypes = 'ASC' | 'DESC' | 'RAND' | 'NONE';
 	export interface PageQuery {
@@ -1554,7 +1554,22 @@ function escapeColumnName(columnName) {
 }
 function questionMarksToOrderedParams(query) {
   let count = 1;
-  return query.replace(/'\?'|\?/g, () => `$${count++}`);
+  let inSingleQuote = false;
+  let inDoubleQuote = false;
+  return query.replace(/('|"|\?)/g, (char) => {
+    if (char === "'") {
+      inSingleQuote = !inSingleQuote && !inDoubleQuote;
+      return char;
+    }
+    if (char === '"') {
+      inDoubleQuote = !inDoubleQuote && !inSingleQuote;
+      return char;
+    }
+    if (char === "?" && !inSingleQuote && !inDoubleQuote) {
+      return `$${count++}`;
+    }
+    return char;
+  });
 }
 function insertObjectQuery(table, obj) {
   const keys = Object.keys(obj);