@restura/core 0.1.0-alpha.14 → 0.1.0-alpha.15

package/dist/index.js

@@ -260,7 +260,7 @@ var import_crypto = require("crypto");
 var express = __toESM(require("express"));
 var import_fs3 = __toESM(require("fs"));
 var import_path3 = __toESM(require("path"));
-var import_pg3 = __toESM(require("pg"));
+var import_pg4 = __toESM(require("pg"));
 var prettier3 = __toESM(require("prettier"));
 
 // src/restura/sql/SqlUtils.ts
@@ -792,7 +792,7 @@ var joinDataSchema = import_zod3.z.object({
 var requestDataSchema = import_zod3.z.object({
   name: import_zod3.z.string(),
   required: import_zod3.z.boolean(),
-  isNullable: import_zod3.z.boolean().optional().default(false),
+  isNullable: import_zod3.z.boolean().optional(),
   validator: import_zod3.z.array(validatorDataSchema)
 }).strict();
 var responseDataSchema = import_zod3.z.object({
@@ -878,6 +878,12 @@ var postgresColumnDateTypesSchema = import_zod3.z.enum([
   "INTERVAL"
   // time span
 ]);
+var postgresColumnJsonTypesSchema = import_zod3.z.enum([
+  "JSON",
+  // stores JSON data as raw text
+  "JSONB"
+  // stores JSON data in a binary format, optimized for query performance
+]);
 var mariaDbColumnNumericTypesSchema = import_zod3.z.enum([
   "BOOLEAN",
   // 1-byte A synonym for "TINYINT(1)". Supported from version 1.2.0 onwards.
@@ -940,6 +946,7 @@ var columnDataSchema = import_zod3.z.object({
     postgresColumnNumericTypesSchema,
     postgresColumnStringTypesSchema,
     postgresColumnDateTypesSchema,
+    postgresColumnJsonTypesSchema,
     mariaDbColumnNumericTypesSchema,
     mariaDbColumnStringTypesSchema,
     mariaDbColumnDateTypesSchema
@@ -1247,10 +1254,16 @@ function convertTable(table) {
 
 // src/restura/sql/PsqlEngine.ts
 var import_core_utils5 = require("@redskytech/core-utils");
+var import_pg_diff_sync = __toESM(require("@wmfs/pg-diff-sync"));
+var import_pg_info = __toESM(require("@wmfs/pg-info"));
+var import_pg2 = __toESM(require("pg"));
 
 // src/restura/sql/PsqlPool.ts
 var import_pg = __toESM(require("pg"));
 
+// src/restura/sql/PsqlConnection.ts
+var import_pg_format2 = __toESM(require("pg-format"));
+
 // src/restura/sql/PsqlUtils.ts
 var import_pg_format = __toESM(require("pg-format"));
 function escapeColumnName(columnName) {
@@ -1299,7 +1312,6 @@ function SQL(strings, ...values) {
 }
 
 // src/restura/sql/PsqlConnection.ts
-var import_pg_format2 = __toESM(require("pg-format"));
 var PsqlConnection = class {
   constructor() {
   }
@@ -1578,9 +1590,7 @@ var filterPsqlParser = import_pegjs.default.generate(filterSqlGrammar, {
 var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts
-var import_pg_diff_sync = __toESM(require("@wmfs/pg-diff-sync"));
-var import_pg_info = __toESM(require("@wmfs/pg-info"));
-var { Client } = "pg";
+var { Client } = import_pg2.default;
 var systemUser = {
   role: "",
   host: "",
@@ -1628,7 +1638,7 @@ var PsqlEngine = class extends SqlEngine {
         }
         if (column.isNullable) columnSql += " NULL";
         else columnSql += " NOT NULL";
-        if (column.default) columnSql += ` DEFAULT '${column.default}'`;
+        if (column.default) columnSql += ` DEFAULT ${column.default}`;
         tableColumns.push(columnSql);
       }
       sql += tableColumns.join(", \n");
@@ -1715,12 +1725,10 @@ var PsqlEngine = class extends SqlEngine {
     await originalClient.connect();
     await scratchClient.connect();
     const info1 = await (0, import_pg_info.default)({
-      client: originalClient,
-      schema: "public"
+      client: originalClient
     });
     const info2 = await (0, import_pg_info.default)({
-      client: scratchClient,
-      schema: "public"
+      client: scratchClient
     });
     const diff = (0, import_pg_diff_sync.default)(info1, info2);
     await originalClient.end();
@@ -1999,17 +2007,17 @@ var PsqlEngine = class extends SqlEngine {
     return whereClause;
   }
 };
-var schemaToPsqlType = (column, tableName) => {
+function schemaToPsqlType(column, tableName) {
   if (column.hasAutoIncrement) return "BIGSERIAL";
   if (column.type === "ENUM") return `"${tableName}_${column.name}_enum"`;
   if (column.type === "DATETIME") return "TIMESTAMPTZ";
   if (column.type === "MEDIUMINT") return "INT";
   return column.type;
-};
+}
 
 // src/restura/sql/PsqlTransaction.ts
-var import_pg2 = __toESM(require("pg"));
-var { Client: Client2 } = import_pg2.default;
+var import_pg3 = __toESM(require("pg"));
+var { Client: Client2 } = import_pg3.default;
 var PsqlTransaction = class extends PsqlConnection {
   constructor(clientConfig) {
     super();
@@ -2040,21 +2048,21 @@ var PsqlTransaction = class extends PsqlConnection {
 var import_lodash = __toESM(require("lodash.clonedeep"));
 var CompareSchema = class {
   async diffSchema(newSchema, latestSchema, psqlEngine) {
-    let endPoints = this.diffEndPoints(newSchema.endpoints[0].routes, latestSchema.endpoints[0].routes);
-    let globalParams = this.diffStringArray(newSchema.globalParams, latestSchema.globalParams);
-    let roles = this.diffStringArray(newSchema.roles, latestSchema.roles);
+    const endPoints = this.diffEndPoints(newSchema.endpoints[0].routes, latestSchema.endpoints[0].routes);
+    const globalParams = this.diffStringArray(newSchema.globalParams, latestSchema.globalParams);
+    const roles = this.diffStringArray(newSchema.roles, latestSchema.roles);
     let commands = "";
     if (JSON.stringify(newSchema.database) !== JSON.stringify(latestSchema.database))
       commands = await psqlEngine.diffDatabaseToSchema(newSchema);
-    let customTypes = newSchema.customTypes !== latestSchema.customTypes;
+    const customTypes = newSchema.customTypes !== latestSchema.customTypes;
     const schemaPreview = { endPoints, globalParams, roles, commands, customTypes };
     return schemaPreview;
   }
   diffStringArray(newArray, originalArray) {
-    let stringsDiff = [];
-    let originalClone = new Set(originalArray);
+    const stringsDiff = [];
+    const originalClone = new Set(originalArray);
     newArray.forEach((item) => {
-      let originalIndex = originalClone.has(item);
+      const originalIndex = originalClone.has(item);
       if (!originalIndex) {
         stringsDiff.push({
           name: item,
@@ -2073,11 +2081,11 @@ var CompareSchema = class {
     return stringsDiff;
   }
   diffEndPoints(newEndPoints, originalEndpoints) {
-    let originalClone = (0, import_lodash.default)(originalEndpoints);
-    let diffObj = [];
+    const originalClone = (0, import_lodash.default)(originalEndpoints);
+    const diffObj = [];
     newEndPoints.forEach((endPoint) => {
-      let { path: path4, method } = endPoint;
-      let endPointIndex = originalClone.findIndex((original) => {
+      const { path: path4, method } = endPoint;
+      const endPointIndex = originalClone.findIndex((original) => {
         return original.path === endPoint.path && original.method === endPoint.method;
       });
       if (endPointIndex === -1) {
@@ -2086,7 +2094,7 @@ var CompareSchema = class {
           changeType: "NEW"
         });
       } else {
-        let original = originalClone.findIndex((original2) => {
+        const original = originalClone.findIndex((original2) => {
           return this.compareEndPoints(endPoint, original2);
         });
         if (original === -1) {
@@ -2099,7 +2107,7 @@ var CompareSchema = class {
       }
     });
     originalClone.forEach((original) => {
-      let { path: path4, method } = original;
+      const { path: path4, method } = original;
       diffObj.push({
         name: `${method} ${path4}`,
         changeType: "DELETED"
@@ -2127,7 +2135,7 @@ var compareSchema = new CompareSchema();
 var compareSchema_default = compareSchema;
 
 // src/restura/restura.ts
-var { types } = import_pg3.default;
+var { types } = import_pg4.default;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {