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

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>(onInsert: (data: ActionRowInsertData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowInsertFilter): void;
+    addColumnChangeHandler<T>(onUpdate: (data: ActionColumnChangeData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter: ActionColumnChangeFilter): void;
+    addRowDeleteHandler<T>(onDelete: (data: ActionRowDeleteData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowDeleteFilter): void;
     fireActionFromDbTrigger(sqlMutationData: SqlMutationData, result: TriggerResult): Promise<void>;
     private fireInsertActions;
     private fireDeleteActions;
@@ -2529,6 +2529,7 @@ declare class PsqlEngine extends SqlEngine {
     private triggerClient;
     constructor(psqlConnectionPool: PsqlPool, shouldListenForDbTriggers?: boolean);
     close(): Promise<void>;
+    private setupPgReturnTypes;
     private listenForDbTriggers;
     private handleTrigger;
     createDatabaseFromSchema(schema: ResturaSchema, connection: PsqlPool): Promise<string>;
@@ -2547,6 +2548,7 @@ declare class PsqlEngine extends SqlEngine {
     private createUpdateTrigger;
     private createDeleteTrigger;
     private createInsertTriggers;
+    private schemaToPsqlType;
 }
 
 declare class PsqlTransaction extends PsqlConnection {
@@ -2564,6 +2566,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>(onInsert: (data: ActionRowInsertData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowInsertFilter): void;
+    addColumnChangeHandler<T>(onUpdate: (data: ActionColumnChangeData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter: ActionColumnChangeFilter): void;
+    addRowDeleteHandler<T>(onDelete: (data: ActionRowDeleteData<T>, queryMetadata: QueryMetadata) => Promise<void>, filter?: ActionRowDeleteFilter): void;
     fireActionFromDbTrigger(sqlMutationData: SqlMutationData, result: TriggerResult): Promise<void>;
     private fireInsertActions;
     private fireDeleteActions;
@@ -2529,6 +2529,7 @@ declare class PsqlEngine extends SqlEngine {
     private triggerClient;
     constructor(psqlConnectionPool: PsqlPool, shouldListenForDbTriggers?: boolean);
     close(): Promise<void>;
+    private setupPgReturnTypes;
     private listenForDbTriggers;
     private handleTrigger;
     createDatabaseFromSchema(schema: ResturaSchema, connection: PsqlPool): Promise<string>;
@@ -2547,6 +2548,7 @@ declare class PsqlEngine extends SqlEngine {
     private createUpdateTrigger;
     private createDeleteTrigger;
     private createInsertTriggers;
+    private schemaToPsqlType;
 }
 
 declare class PsqlTransaction extends PsqlConnection {
@@ -2564,6 +2566,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

@@ -315,7 +315,6 @@ var import_cookie_parser = __toESM(require("cookie-parser"));
 var express = __toESM(require("express"));
 var import_fs4 = __toESM(require("fs"));
 var import_path5 = __toESM(require("path"));
-var import_pg3 = __toESM(require("pg"));
 var prettier3 = __toESM(require("prettier"));
 
 // src/restura/RsError.ts
@@ -474,10 +473,10 @@ var compareSchema = new CompareSchema();
 var compareSchema_default = compareSchema;
 
 // src/restura/customApiFactory.ts
-var import_internal2 = require("@restura/internal");
 var import_bluebird2 = __toESM(require("bluebird"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+var import_internal2 = require("@restura/internal");
 var CustomApiFactory = class {
   constructor() {
     this.customApis = {};
@@ -486,7 +485,7 @@ var CustomApiFactory = class {
     const apiVersions = ["v1"];
     for (const apiVersion of apiVersions) {
       const apiVersionFolderPath = import_path.default.join(baseFolderPath, apiVersion);
-      const directoryExists = await import_internal2.fileUtils.existDir(apiVersionFolderPath);
+      const directoryExists = await import_internal2.FileUtils.existDir(apiVersionFolderPath);
       if (!directoryExists) continue;
       await this.addDirectory(apiVersionFolderPath, apiVersion);
     }
@@ -972,7 +971,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 {
@@ -1329,7 +1328,7 @@ var import_core_utils3 = require("@redskytech/core-utils");
 var import_jsonschema = __toESM(require("jsonschema"));
 var import_zod4 = require("zod");
 
-// src/restura/utils/addQuotesToStrings.ts
+// src/restura/utils/utils.ts
 function addQuotesToStrings(variable) {
   if (typeof variable === "string") {
     return `'${variable}'`;
@@ -1340,6 +1339,17 @@ function addQuotesToStrings(variable) {
     return variable;
   }
 }
+function sortObjectKeysAlphabetically(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(sortObjectKeysAlphabetically);
+  } else if (obj !== null && typeof obj === "object") {
+    return Object.keys(obj).sort().reduce((sorted, key) => {
+      sorted[key] = sortObjectKeysAlphabetically(obj[key]);
+      return sorted;
+    }, {});
+  }
+  return obj;
+}
 
 // src/restura/validators/requestValidator.ts
 function requestValidator(req, routeData, validationSchema) {
@@ -1554,7 +1564,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);
@@ -1884,7 +1909,7 @@ var filterPsqlParser = import_pegjs.default.generate(filterSqlGrammar, {
 var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts
-var { Client } = import_pg2.default;
+var { Client, types } = import_pg2.default;
 var systemUser = {
   role: "",
   host: "",
@@ -1895,6 +1920,7 @@ var PsqlEngine = class extends SqlEngine {
   constructor(psqlConnectionPool, shouldListenForDbTriggers = false) {
     super();
     this.psqlConnectionPool = psqlConnectionPool;
+    this.setupPgReturnTypes();
     if (shouldListenForDbTriggers) {
       this.setupTriggerListeners = this.listenForDbTriggers();
     }
@@ -1904,6 +1930,16 @@ var PsqlEngine = class extends SqlEngine {
       await this.triggerClient.end();
     }
   }
+  setupPgReturnTypes() {
+    const TIMESTAMPTZ_OID = 1184;
+    types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
+      return val === null ? null : new Date(val).toISOString();
+    });
+    const BIGINT_OID = 20;
+    types.setTypeParser(BIGINT_OID, (val) => {
+      return val === null ? null : Number(val);
+    });
+  }
   async listenForDbTriggers() {
     this.triggerClient = new Client({
       user: this.psqlConnectionPool.poolConfig.user,
@@ -1957,7 +1993,7 @@ var PsqlEngine = class extends SqlEngine {
       const tableColumns = [];
       for (const column of table.columns) {
         let columnSql = "";
-        columnSql += `	"${column.name}" ${schemaToPsqlType(column)}`;
+        columnSql += `	"${column.name}" ${this.schemaToPsqlType(column)}`;
         let value = column.value;
         if (column.type === "JSON") value = "";
         if (column.type === "JSONB") value = "";
@@ -2426,10 +2462,14 @@ CREATE TRIGGER "${tableName}_insert"
 EXECUTE FUNCTION notify_${tableName}_insert();
 		`;
   }
+  schemaToPsqlType(column) {
+    if (column.hasAutoIncrement) return "BIGSERIAL";
+    if (column.type === "ENUM") return `TEXT`;
+    if (column.type === "DATETIME") return "TIMESTAMPTZ";
+    if (column.type === "MEDIUMINT") return "INT";
+    return column.type;
+  }
 };
-__decorateClass([
-  boundMethod
-], PsqlEngine.prototype, "handleTrigger", 1);
 __decorateClass([
   boundMethod
 ], PsqlEngine.prototype, "createUpdateTrigger", 1);
@@ -2439,26 +2479,19 @@ __decorateClass([
 __decorateClass([
   boundMethod
 ], PsqlEngine.prototype, "createInsertTriggers", 1);
-function schemaToPsqlType(column) {
-  if (column.hasAutoIncrement) return "BIGSERIAL";
-  if (column.type === "ENUM") return `TEXT`;
-  if (column.type === "DATETIME") return "TIMESTAMPTZ";
-  if (column.type === "MEDIUMINT") return "INT";
-  return column.type;
-}
 
 // src/restura/utils/TempCache.ts
 var import_fs3 = __toESM(require("fs"));
 var import_path4 = __toESM(require("path"));
 var import_core_utils6 = require("@redskytech/core-utils");
+var import_internal3 = require("@restura/internal");
 var import_bluebird3 = __toESM(require("bluebird"));
 var os2 = __toESM(require("os"));
-var import_internal3 = require("@restura/internal");
 var TempCache = class {
   constructor(location) {
     this.maxDurationDays = 7;
     this.location = location || os2.tmpdir();
-    import_internal3.fileUtils.ensureDir(this.location).catch((e) => {
+    import_internal3.FileUtils.ensureDir(this.location).catch((e) => {
       throw e;
     });
   }
@@ -2480,7 +2513,6 @@ var TempCache = class {
 };
 
 // src/restura/restura.ts
-var { types } = import_pg3.default;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {
@@ -2503,7 +2535,6 @@ var ResturaEngine = class {
     new TempCache(this.resturaConfig.fileTempCachePath);
     this.psqlConnectionPool = psqlConnectionPool;
     this.psqlEngine = new PsqlEngine(this.psqlConnectionPool, true);
-    setupPgReturnTypes();
     await customApiFactory_default.loadApiFiles(this.resturaConfig.customApiFolderPath);
     this.authenticationHandler = authenticationHandler;
     app.use((0, import_compression.default)());
@@ -2654,7 +2685,7 @@ var ResturaEngine = class {
   }
   async updateSchema(req, res) {
     try {
-      this.schema = req.data;
+      this.schema = sortObjectKeysAlphabetically(req.data);
       await this.storeFileSystemSchema();
       await this.reloadEndpoints();
       await this.updateTypes();
@@ -2816,22 +2847,11 @@ __decorateClass([
 __decorateClass([
   boundMethod
 ], ResturaEngine.prototype, "runCustomRouteLogic", 1);
-function setupPgReturnTypes() {
-  const TIMESTAMPTZ_OID = 1184;
-  types.setTypeParser(TIMESTAMPTZ_OID, (val) => {
-    return val === null ? null : new Date(val).toISOString();
-  });
-  const BIGINT_OID = 20;
-  types.setTypeParser(BIGINT_OID, (val) => {
-    return val === null ? null : Number(val);
-  });
-}
-setupPgReturnTypes();
 var restura = new ResturaEngine();
 
 // src/restura/sql/PsqlTransaction.ts
-var import_pg4 = __toESM(require("pg"));
-var { Client: Client2 } = import_pg4.default;
+var import_pg3 = __toESM(require("pg"));
+var { Client: Client2 } = import_pg3.default;
 var PsqlTransaction = class extends PsqlConnection {
   constructor(clientConfig) {
     super();