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

package/dist/index.mjs

@@ -269,7 +269,6 @@ import cookieParser from "cookie-parser";
 import * as express from "express";
 import fs4 from "fs";
 import path4 from "path";
-import pg3 from "pg";
 import * as prettier3 from "prettier";
 
 // src/restura/RsError.ts
@@ -428,10 +427,10 @@ var compareSchema = new CompareSchema();
 var compareSchema_default = compareSchema;
 
 // src/restura/customApiFactory.ts
-import { fileUtils } from "@restura/internal";
 import Bluebird2 from "bluebird";
 import fs from "fs";
 import path from "path";
+import { FileUtils } from "@restura/internal";
 var CustomApiFactory = class {
   constructor() {
     this.customApis = {};
@@ -440,7 +439,7 @@ var CustomApiFactory = class {
     const apiVersions = ["v1"];
     for (const apiVersion of apiVersions) {
       const apiVersionFolderPath = path.join(baseFolderPath, apiVersion);
-      const directoryExists = await fileUtils.existDir(apiVersionFolderPath);
+      const directoryExists = await FileUtils.existDir(apiVersionFolderPath);
       if (!directoryExists) continue;
       await this.addDirectory(apiVersionFolderPath, apiVersion);
     }
@@ -926,7 +925,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 {
@@ -1283,7 +1282,7 @@ import { ObjectUtils as ObjectUtils2 } from "@redskytech/core-utils";
 import jsonschema from "jsonschema";
 import { z as z4 } from "zod";
 
-// src/restura/utils/addQuotesToStrings.ts
+// src/restura/utils/utils.ts
 function addQuotesToStrings(variable) {
   if (typeof variable === "string") {
     return `'${variable}'`;
@@ -1294,6 +1293,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) {
@@ -1508,7 +1518,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);
@@ -1838,7 +1863,7 @@ var filterPsqlParser = peg.generate(filterSqlGrammar, {
 var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts
-var { Client } = pg2;
+var { Client, types } = pg2;
 var systemUser = {
   role: "",
   host: "",
@@ -1849,6 +1874,7 @@ var PsqlEngine = class extends SqlEngine {
   constructor(psqlConnectionPool, shouldListenForDbTriggers = false) {
     super();
     this.psqlConnectionPool = psqlConnectionPool;
+    this.setupPgReturnTypes();
     if (shouldListenForDbTriggers) {
       this.setupTriggerListeners = this.listenForDbTriggers();
     }
@@ -1858,6 +1884,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,
@@ -1911,7 +1947,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 = "";
@@ -2380,10 +2416,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);
@@ -2393,26 +2433,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
 import fs3 from "fs";
 import path3 from "path";
 import { DateUtils } from "@redskytech/core-utils";
+import { FileUtils as FileUtils2 } from "@restura/internal";
 import Bluebird3 from "bluebird";
 import * as os2 from "os";
-import { fileUtils as fileUtils2 } from "@restura/internal";
 var TempCache = class {
   constructor(location) {
     this.maxDurationDays = 7;
     this.location = location || os2.tmpdir();
-    fileUtils2.ensureDir(this.location).catch((e) => {
+    FileUtils2.ensureDir(this.location).catch((e) => {
       throw e;
     });
   }
@@ -2434,7 +2467,6 @@ var TempCache = class {
 };
 
 // src/restura/restura.ts
-var { types } = pg3;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {
@@ -2457,7 +2489,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(compression());
@@ -2608,7 +2639,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();
@@ -2770,22 +2801,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
-import pg4 from "pg";
-var { Client: Client2 } = pg4;
+import pg3 from "pg";
+var { Client: Client2 } = pg3;
 var PsqlTransaction = class extends PsqlConnection {
   constructor(clientConfig) {
     super();