@restura/core 0.1.0-alpha.30 → 0.1.0-alpha.32

package/dist/index.mjs

@@ -350,8 +350,14 @@ var CompareSchema = class {
     let commands = "";
     if (JSON.stringify(newSchema.database) !== JSON.stringify(latestSchema.database))
       commands = await psqlEngine.diffDatabaseToSchema(newSchema);
-    const customTypes = newSchema.customTypes !== latestSchema.customTypes;
-    const schemaPreview = { endPoints, globalParams, roles, commands, customTypes };
+    const hasCustomTypesChanged = JSON.stringify(newSchema.customTypes) !== JSON.stringify(latestSchema.customTypes);
+    const schemaPreview = {
+      endPoints,
+      globalParams,
+      roles,
+      commands,
+      customTypes: hasCustomTypesChanged
+    };
     return schemaPreview;
   }
   diffStringArray(newArray, originalArray) {
@@ -838,7 +844,7 @@ function apiGenerator(schema) {
     apiString += `
 
 		declare namespace CustomTypes {
-			${schema.customTypes}
+			${schema.customTypes.join("\n")}
 		}`;
   }
   return prettier.format(apiString, __spreadValues({
@@ -860,10 +866,14 @@ import tmp from "tmp";
 import * as TJS from "typescript-json-schema";
 function customTypeValidationGenerator(currentSchema) {
   const schemaObject = {};
-  const customInterfaceNames = currentSchema.customTypes.match(new RegExp("(?<=interface\\s)(\\w+)|(?<=type\\s)(\\w+)", "g"));
+  const customInterfaceNames = currentSchema.customTypes.map((customType) => {
+    const matches = customType.match(new RegExp("(?<=interface\\s)(\\w+)|(?<=type\\s)(\\w+)", "g"));
+    if (matches && matches.length > 0) return matches[0];
+    return "";
+  }).filter(Boolean);
   if (!customInterfaceNames) return {};
   const temporaryFile = tmp.fileSync({ mode: 420, prefix: "prefix-", postfix: ".ts" });
-  fs2.writeFileSync(temporaryFile.name, currentSchema.customTypes);
+  fs2.writeFileSync(temporaryFile.name, currentSchema.customTypes.join("\n"));
   const compilerOptions = {
     strictNullChecks: true,
     skipLibCheck: true
@@ -1030,7 +1040,7 @@ var groupBySchema = z3.object({
 var whereDataSchema = z3.object({
   tableName: z3.string().optional(),
   columnName: z3.string().optional(),
-  operator: z3.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH"]).optional(),
+  operator: z3.enum(["=", "<", ">", "<=", ">=", "!=", "LIKE", "IN", "NOT IN", "STARTS WITH", "ENDS WITH", "IS", "IS NOT"]).optional(),
   value: z3.string().or(z3.number()).optional(),
   custom: z3.string().optional(),
   conjunction: z3.enum(["AND", "OR"]).optional()
@@ -1269,7 +1279,7 @@ var resturaSchema = z3.object({
   endpoints: z3.array(endpointDataSchema),
   globalParams: z3.array(z3.string()),
   roles: z3.array(z3.string()),
-  customTypes: z3.string()
+  customTypes: z3.array(z3.string())
 }).strict();
 async function isSchemaValid(schemaToCheck) {
   try {
@@ -1465,9 +1475,15 @@ function getRequestData(req) {
           bodyData[attr] = attrList;
         }
       } else {
-        bodyData[attr] = ObjectUtils2.safeParse(bodyData[attr]);
-        if (isNaN(Number(bodyData[attr]))) continue;
-        bodyData[attr] = Number(bodyData[attr]);
+        if (bodyData[attr] === "true") {
+          bodyData[attr] = true;
+        } else if (bodyData[attr] === "false") {
+          bodyData[attr] = false;
+        } else {
+          bodyData[attr] = ObjectUtils2.safeParse(bodyData[attr]);
+          if (isNaN(Number(bodyData[attr]))) continue;
+          bodyData[attr] = Number(bodyData[attr]);
+        }
       }
     }
   }
@@ -1582,8 +1598,8 @@ function SQL(strings, ...values) {
 
 // src/restura/sql/PsqlConnection.ts
 var PsqlConnection = class {
-  constructor() {
-    this.instanceId = crypto.randomUUID();
+  constructor(instanceId) {
+    this.instanceId = instanceId || crypto.randomUUID();
   }
   // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   async queryOne(query, options, requesterDetails) {
@@ -2813,8 +2829,8 @@ var restura = new ResturaEngine();
 import pg3 from "pg";
 var { Client: Client2 } = pg3;
 var PsqlTransaction = class extends PsqlConnection {
-  constructor(clientConfig) {
-    super();
+  constructor(clientConfig, instanceId) {
+    super(instanceId);
     this.clientConfig = clientConfig;
     this.client = new Client2(clientConfig);
     this.connectPromise = this.client.connect();