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

package/dist/index.mjs

@@ -216,7 +216,7 @@ import { createHash } from "crypto";
 import * as express from "express";
 import fs3 from "fs";
 import path3 from "path";
-import pg3 from "pg";
+import pg4 from "pg";
 import * as prettier3 from "prettier";
 
 // src/restura/sql/SqlUtils.ts
@@ -748,7 +748,7 @@ var joinDataSchema = z3.object({
 var requestDataSchema = z3.object({
   name: z3.string(),
   required: z3.boolean(),
-  isNullable: z3.boolean().optional().default(false),
+  isNullable: z3.boolean().optional(),
   validator: z3.array(validatorDataSchema)
 }).strict();
 var responseDataSchema = z3.object({
@@ -834,6 +834,12 @@ var postgresColumnDateTypesSchema = z3.enum([
   "INTERVAL"
   // time span
 ]);
+var postgresColumnJsonTypesSchema = z3.enum([
+  "JSON",
+  // stores JSON data as raw text
+  "JSONB"
+  // stores JSON data in a binary format, optimized for query performance
+]);
 var mariaDbColumnNumericTypesSchema = z3.enum([
   "BOOLEAN",
   // 1-byte A synonym for "TINYINT(1)". Supported from version 1.2.0 onwards.
@@ -896,6 +902,7 @@ var columnDataSchema = z3.object({
     postgresColumnNumericTypesSchema,
     postgresColumnStringTypesSchema,
     postgresColumnDateTypesSchema,
+    postgresColumnJsonTypesSchema,
     mariaDbColumnNumericTypesSchema,
     mariaDbColumnStringTypesSchema,
     mariaDbColumnDateTypesSchema
@@ -1203,10 +1210,16 @@ function convertTable(table) {
 
 // src/restura/sql/PsqlEngine.ts
 import { ObjectUtils as ObjectUtils4 } from "@redskytech/core-utils";
+import getDiff from "@wmfs/pg-diff-sync";
+import pgInfo from "@wmfs/pg-info";
+import pg2 from "pg";
 
 // src/restura/sql/PsqlPool.ts
 import pg from "pg";
 
+// src/restura/sql/PsqlConnection.ts
+import format3 from "pg-format";
+
 // src/restura/sql/PsqlUtils.ts
 import format2 from "pg-format";
 function escapeColumnName(columnName) {
@@ -1255,7 +1268,6 @@ function SQL(strings, ...values) {
 }
 
 // src/restura/sql/PsqlConnection.ts
-import format3 from "pg-format";
 var PsqlConnection = class {
   constructor() {
   }
@@ -1534,9 +1546,7 @@ var filterPsqlParser = peg.generate(filterSqlGrammar, {
 var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts
-import getDiff from "@wmfs/pg-diff-sync";
-import pgInfo from "@wmfs/pg-info";
-var { Client } = "pg";
+var { Client } = pg2;
 var systemUser = {
   role: "",
   host: "",
@@ -1584,7 +1594,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");
@@ -1671,12 +1681,10 @@ var PsqlEngine = class extends SqlEngine {
     await originalClient.connect();
     await scratchClient.connect();
     const info1 = await pgInfo({
-      client: originalClient,
-      schema: "public"
+      client: originalClient
     });
     const info2 = await pgInfo({
-      client: scratchClient,
-      schema: "public"
+      client: scratchClient
     });
     const diff = getDiff(info1, info2);
     await originalClient.end();
@@ -1955,17 +1963,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
-import pg2 from "pg";
-var { Client: Client2 } = pg2;
+import pg3 from "pg";
+var { Client: Client2 } = pg3;
 var PsqlTransaction = class extends PsqlConnection {
   constructor(clientConfig) {
     super();
@@ -1996,21 +2004,21 @@ var PsqlTransaction = class extends PsqlConnection {
 import cloneDeep from "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,
@@ -2029,11 +2037,11 @@ var CompareSchema = class {
     return stringsDiff;
   }
   diffEndPoints(newEndPoints, originalEndpoints) {
-    let originalClone = cloneDeep(originalEndpoints);
-    let diffObj = [];
+    const originalClone = cloneDeep(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) {
@@ -2042,7 +2050,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) {
@@ -2055,7 +2063,7 @@ var CompareSchema = class {
       }
     });
     originalClone.forEach((original) => {
-      let { path: path4, method } = original;
+      const { path: path4, method } = original;
       diffObj.push({
         name: `${method} ${path4}`,
         changeType: "DELETED"
@@ -2083,7 +2091,7 @@ var compareSchema = new CompareSchema();
 var compareSchema_default = compareSchema;
 
 // src/restura/restura.ts
-var { types } = pg3;
+var { types } = pg4;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {