@restura/core 0.1.0-alpha.35 → 0.1.0-alpha.36

package/dist/index.d.mts

@@ -124,15 +124,16 @@ interface DatabaseActionData {
     queryMetadata: QueryMetadata;
 }
 interface ActionRowInsertData<T = DynamicObject> extends DatabaseActionData {
-    insertId: number;
+    insertedId: number;
     insertObject: T;
 }
 interface ActionRowDeleteData<T = DynamicObject> extends DatabaseActionData {
+    deletedId: number;
     deletedRow: T;
 }
 interface ActionColumnChangeData<T = DynamicObject> extends DatabaseActionData {
     tableName: string;
-    rowId: number;
+    changedId: number;
     newData: T;
     oldData: T;
 }
@@ -148,8 +149,10 @@ interface ActionColumnChangeFilter {
 }
 type TriggerResult = {
     table: string;
-    insertId?: number;
-    query: string;
+    insertedId?: number;
+    changedId?: number;
+    deletedId?: number;
+    queryMetadata: QueryMetadata;
     record: DynamicObject;
     previousRecord: DynamicObject;
     requesterId: number;
@@ -1091,6 +1094,7 @@ declare const tableDataSchema: z.ZodObject<{
         check: string;
     }>, "many">;
     roles: z.ZodArray<z.ZodString, "many">;
+    notify: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"ALL">, z.ZodArray<z.ZodString, "many">]>>;
 }, "strict", z.ZodTypeAny, {
     name: string;
     roles: string[];
@@ -1126,6 +1130,7 @@ declare const tableDataSchema: z.ZodObject<{
         name: string;
         check: string;
     }[];
+    notify?: string[] | "ALL" | undefined;
 }, {
     name: string;
     roles: string[];
@@ -1161,6 +1166,7 @@ declare const tableDataSchema: z.ZodObject<{
         name: string;
         check: string;
     }[];
+    notify?: string[] | "ALL" | undefined;
 }>;
 type TableData = z.infer<typeof tableDataSchema>;
 declare const resturaSchema: z.ZodObject<{
@@ -1255,6 +1261,7 @@ declare const resturaSchema: z.ZodObject<{
             check: string;
         }>, "many">;
         roles: z.ZodArray<z.ZodString, "many">;
+        notify: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"ALL">, z.ZodArray<z.ZodString, "many">]>>;
     }, "strict", z.ZodTypeAny, {
         name: string;
         roles: string[];
@@ -1290,6 +1297,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }, {
         name: string;
         roles: string[];
@@ -1325,6 +1333,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }>, "many">;
     endpoints: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
@@ -2143,6 +2152,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }[];
     endpoints: {
         name: string;
@@ -2290,6 +2300,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }[];
     endpoints: {
         name: string;

package/dist/index.d.ts

@@ -124,15 +124,16 @@ interface DatabaseActionData {
     queryMetadata: QueryMetadata;
 }
 interface ActionRowInsertData<T = DynamicObject> extends DatabaseActionData {
-    insertId: number;
+    insertedId: number;
     insertObject: T;
 }
 interface ActionRowDeleteData<T = DynamicObject> extends DatabaseActionData {
+    deletedId: number;
     deletedRow: T;
 }
 interface ActionColumnChangeData<T = DynamicObject> extends DatabaseActionData {
     tableName: string;
-    rowId: number;
+    changedId: number;
     newData: T;
     oldData: T;
 }
@@ -148,8 +149,10 @@ interface ActionColumnChangeFilter {
 }
 type TriggerResult = {
     table: string;
-    insertId?: number;
-    query: string;
+    insertedId?: number;
+    changedId?: number;
+    deletedId?: number;
+    queryMetadata: QueryMetadata;
     record: DynamicObject;
     previousRecord: DynamicObject;
     requesterId: number;
@@ -1091,6 +1094,7 @@ declare const tableDataSchema: z.ZodObject<{
         check: string;
     }>, "many">;
     roles: z.ZodArray<z.ZodString, "many">;
+    notify: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"ALL">, z.ZodArray<z.ZodString, "many">]>>;
 }, "strict", z.ZodTypeAny, {
     name: string;
     roles: string[];
@@ -1126,6 +1130,7 @@ declare const tableDataSchema: z.ZodObject<{
         name: string;
         check: string;
     }[];
+    notify?: string[] | "ALL" | undefined;
 }, {
     name: string;
     roles: string[];
@@ -1161,6 +1166,7 @@ declare const tableDataSchema: z.ZodObject<{
         name: string;
         check: string;
     }[];
+    notify?: string[] | "ALL" | undefined;
 }>;
 type TableData = z.infer<typeof tableDataSchema>;
 declare const resturaSchema: z.ZodObject<{
@@ -1255,6 +1261,7 @@ declare const resturaSchema: z.ZodObject<{
             check: string;
         }>, "many">;
         roles: z.ZodArray<z.ZodString, "many">;
+        notify: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"ALL">, z.ZodArray<z.ZodString, "many">]>>;
     }, "strict", z.ZodTypeAny, {
         name: string;
         roles: string[];
@@ -1290,6 +1297,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }, {
         name: string;
         roles: string[];
@@ -1325,6 +1333,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }>, "many">;
     endpoints: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
@@ -2143,6 +2152,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }[];
     endpoints: {
         name: string;
@@ -2290,6 +2300,7 @@ declare const resturaSchema: z.ZodObject<{
             name: string;
             check: string;
         }[];
+        notify?: string[] | "ALL" | undefined;
     }[];
     endpoints: {
         name: string;

package/dist/index.js

@@ -176,7 +176,7 @@ var EventManager = class {
         if (!this.hasHandlersForEventType("DATABASE_ROW_INSERT", filter, triggerResult)) return;
         const insertData = {
           tableName: triggerResult.table,
-          insertId: triggerResult.record.id,
+          insertedId: triggerResult.insertedId || 0,
           insertObject: triggerResult.record,
           queryMetadata: data.queryMetadata
         };
@@ -192,6 +192,7 @@ var EventManager = class {
         if (!this.hasHandlersForEventType("DATABASE_ROW_DELETE", filter, triggerResult)) return;
         const deleteData = {
           tableName: triggerResult.table,
+          deletedId: triggerResult.deletedId || 0,
           deletedRow: triggerResult.previousRecord,
           queryMetadata: data.queryMetadata
         };
@@ -207,7 +208,7 @@ var EventManager = class {
         if (!this.hasHandlersForEventType("DATABASE_COLUMN_UPDATE", filter, triggerResult)) return;
         const columnChangeData = {
           tableName: triggerResult.table,
-          rowId: triggerResult.record.id,
+          changedId: triggerResult.changedId || 0,
           newData: triggerResult.record,
           oldData: triggerResult.previousRecord,
           queryMetadata: data.queryMetadata
@@ -551,7 +552,7 @@ var SqlUtils = class _SqlUtils {
   static convertDatabaseTypeToTypescript(type, value) {
     type = type.toLocaleLowerCase();
     if (type.startsWith("tinyint") || type.startsWith("boolean")) return "boolean";
-    if (type.indexOf("int") > -1 || type.startsWith("decimal") || type.startsWith("double") || type.startsWith("float"))
+    if (type.indexOf("int") > -1 || type.startsWith("decimal") || type.startsWith("double") || type.startsWith("float") || type.indexOf("serial") > -1 || type.startsWith("decimal") || type.startsWith("real") || type.startsWith("double precision") || type.startsWith("numeric"))
       return "number";
     if (type === "json") {
       if (!value) return "object";
@@ -833,21 +834,28 @@ var ApiTree = class _ApiTree {
         return `export type Res = CustomTypes.${route.responseType}[]`;
       else return `export type Res = CustomTypes.${route.responseType}`;
     }
-    return `export interface Res ${this.getFields(route.response)}`;
+    return `export interface Res ${this.getFields(route.response, route.table, route.joins)}`;
   }
-  getFields(fields) {
-    const nameFields = fields.map((f) => this.getNameAndType(f));
+  getFields(fields, routeBaseTable, joins) {
+    const nameFields = fields.map((f) => this.getNameAndType(f, routeBaseTable, joins));
     const nested = `{
 			${nameFields.join(";\n	")}${import_core_utils.ObjectUtils.isArrayWithData(nameFields) ? ";" : ""}
 		}`;
     return nested;
   }
-  getNameAndType(p) {
+  getNameAndType(p, routeBaseTable, joins) {
     let responseType = "any", isNullable = false, array = false;
     if (p.selector) {
       ({ responseType, isNullable } = this.getTypeFromTable(p.selector, p.name));
+      const selectorKey = p.selector.split(".")[0];
+      if (selectorKey !== routeBaseTable) {
+        const join = joins.find((j) => j.alias === selectorKey);
+        if (join && join.type !== "INNER") {
+          isNullable = true;
+        }
+      }
     } else if (p.subquery) {
-      responseType = this.getFields(p.subquery.properties);
+      responseType = this.getFields(p.subquery.properties, p.subquery.table, p.subquery.joins);
       array = true;
     }
     return `${p.name}:${responseType}${array ? "[]" : ""}${isNullable ? " | null" : ""}`;
@@ -1313,7 +1321,8 @@ var tableDataSchema = import_zod3.z.object({
   indexes: import_zod3.z.array(indexDataSchema),
   foreignKeys: import_zod3.z.array(foreignKeyDataSchema),
   checkConstraints: import_zod3.z.array(checkConstraintDataSchema),
-  roles: import_zod3.z.array(import_zod3.z.string())
+  roles: import_zod3.z.array(import_zod3.z.string()),
+  notify: import_zod3.z.union([import_zod3.z.literal("ALL"), import_zod3.z.array(import_zod3.z.string())]).optional()
 }).strict();
 var endpointDataSchema = import_zod3.z.object({
   name: import_zod3.z.string(),
@@ -1986,16 +1995,8 @@ var PsqlEngine = class extends SqlEngine {
     });
   }
   async handleTrigger(payload, mutationType) {
-    const findRequesterDetailsRegex = /^--QUERY_METADATA\(\{.*\}\)/;
-    const match = payload.query.match(findRequesterDetailsRegex);
-    if (match) {
-      const jsonString = match[0].slice(match[0].indexOf("{"), match[0].lastIndexOf("}") + 1);
-      const queryMetadata = import_core_utils5.ObjectUtils.safeParse(jsonString);
-      const triggerFromThisInstance = queryMetadata.connectionInstanceId === this.psqlConnectionPool.instanceId;
-      if (!triggerFromThisInstance) {
-        return;
-      }
-      await eventManager_default.fireActionFromDbTrigger({ queryMetadata, mutationType }, payload);
+    if (payload.queryMetadata && payload.queryMetadata.connectionInstanceId === this.psqlConnectionPool.instanceId) {
+      await eventManager_default.fireActionFromDbTrigger({ queryMetadata: payload.queryMetadata, mutationType }, payload);
     }
   }
   async createDatabaseFromSchema(schema, connection) {
@@ -2008,9 +2009,11 @@ var PsqlEngine = class extends SqlEngine {
     const indexes = [];
     const triggers = [];
     for (const table of schema.database) {
-      triggers.push(this.createInsertTriggers(table.name));
-      triggers.push(this.createUpdateTrigger(table.name));
-      triggers.push(this.createDeleteTrigger(table.name));
+      if (table.notify) {
+        triggers.push(this.createInsertTriggers(table.name, table.notify));
+        triggers.push(this.createUpdateTrigger(table.name, table.notify));
+        triggers.push(this.createDeleteTrigger(table.name, table.notify));
+      }
       let sql = `CREATE TABLE "${table.name}"
 					   ( `;
       const tableColumns = [];
@@ -2437,53 +2440,216 @@ DELETE FROM "${routeData.table}" ${joinStatement} ${whereClause}`;
     }
     return whereClause;
   }
-  createUpdateTrigger(tableName) {
-    return ` 
+  createUpdateTrigger(tableName, notify) {
+    if (!notify) return "";
+    if (notify === "ALL") {
+      return `
 CREATE OR REPLACE FUNCTION notify_${tableName}_update()
-    RETURNS TRIGGER AS $$
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
 BEGIN
-    PERFORM pg_notify('update', JSON_BUILD_OBJECT('table', '${tableName}', 'query', current_query(), 'record', NEW, 'previousRecord', OLD)::text);
-    RETURN NEW;
+	SELECT INTO query_metadata
+				(regexp_match(
+						current_query(),
+						'^--QUERY_METADATA\\(({.*})', 'n'
+				))[1]::json;
+
+	PERFORM pg_notify(
+		'update',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'changedId', NEW.id,
+						'record', NEW, 
+						'previousRecord', OLD
+		)::text
+		);
+	RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE TRIGGER ${tableName}_update
-    AFTER UPDATE ON "${tableName}"
-    FOR EACH ROW
+	AFTER UPDATE ON "${tableName}"
+	FOR EACH ROW
+EXECUTE FUNCTION notify_${tableName}_update();
+`;
+    }
+    const notifyColumnNewBuildString = notify.map((column) => `'${column}', NEW."${column}"`).join(",\n");
+    const notifyColumnOldBuildString = notify.map((column) => `'${column}', OLD."${column}"`).join(",\n");
+    return `
+CREATE OR REPLACE FUNCTION notify_${tableName}_update()
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
+BEGIN
+	SELECT INTO query_metadata
+				(regexp_match(
+						current_query(),
+						'^--QUERY_METADATA\\(({.*})', 'n'
+				))[1]::json;
+
+	PERFORM pg_notify(
+		'update',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'changedId', NEW.id,
+						'record', json_build_object(
+							${notifyColumnNewBuildString}
+						),
+						'previousRecord', json_build_object(
+							${notifyColumnOldBuildString}
+						)
+		)::text
+		);
+	RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE TRIGGER ${tableName}_update
+	AFTER UPDATE ON "${tableName}"
+	FOR EACH ROW
 EXECUTE FUNCTION notify_${tableName}_update();
 		`;
   }
-  createDeleteTrigger(tableName) {
+  createDeleteTrigger(tableName, notify) {
+    if (!notify) return "";
+    if (notify === "ALL") {
+      return `
+CREATE OR REPLACE FUNCTION notify_${tableName}_delete()
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
+BEGIN
+	SELECT INTO query_metadata
+			(regexp_match(
+					current_query(),
+					'^--QUERY_METADATA\\(({.*})', 'n'
+			))[1]::json;
+
+	PERFORM pg_notify(
+		'delete',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'deletedId', OLD.id,
+						'previousRecord', OLD
+		)::text
+		);
+	RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE TRIGGER "${tableName}_delete"
+	AFTER DELETE ON "${tableName}"
+	FOR EACH ROW
+EXECUTE FUNCTION notify_${tableName}_delete();
+`;
+    }
+    const notifyColumnOldBuildString = notify.map((column) => `'${column}', OLD."${column}"`).join(",\n");
     return `
 CREATE OR REPLACE FUNCTION notify_${tableName}_delete()
-    RETURNS TRIGGER AS $$
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
 BEGIN
-    PERFORM pg_notify('delete', JSON_BUILD_OBJECT('table', '${tableName}', 'query', current_query(), 'record', NEW, 'previousRecord', OLD)::text);
-    RETURN NEW;
+	SELECT INTO query_metadata
+			(regexp_match(
+					current_query(),
+					'^--QUERY_METADATA\\(({.*})', 'n'
+			))[1]::json;
+
+	PERFORM pg_notify(
+		'delete',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'deletedId', OLD.id,
+						'previousRecord', json_build_object(
+							${notifyColumnOldBuildString}
+						)
+		)::text
+		);
+	RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE TRIGGER "${tableName}_delete"
-    AFTER DELETE ON "${tableName}"
-    FOR EACH ROW
+	AFTER DELETE ON "${tableName}"
+	FOR EACH ROW
 EXECUTE FUNCTION notify_${tableName}_delete();
 		`;
   }
-  createInsertTriggers(tableName) {
+  createInsertTriggers(tableName, notify) {
+    if (!notify) return "";
+    if (notify === "ALL") {
+      return `
+CREATE OR REPLACE FUNCTION notify_${tableName}_insert()
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
+BEGIN
+	SELECT INTO query_metadata
+			(regexp_match(
+					current_query(),
+					'^--QUERY_METADATA\\(({.*})', 'n'
+			))[1]::json;
+
+	PERFORM pg_notify(
+		'insert',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'insertedId', NEW.id,
+						'record', NEW
+		)::text
+		);
+
+	RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE TRIGGER "${tableName}_insert"
+	AFTER INSERT ON "${tableName}"
+	FOR EACH ROW
+EXECUTE FUNCTION notify_${tableName}_insert();
+`;
+    }
+    const notifyColumnNewBuildString = notify.map((column) => `'${column}', NEW."${column}"`).join(",\n");
     return `
 CREATE OR REPLACE FUNCTION notify_${tableName}_insert()
-    RETURNS TRIGGER AS $$
+	RETURNS TRIGGER AS $$
+DECLARE
+	query_metadata JSON;
 BEGIN
-    PERFORM pg_notify('insert', JSON_BUILD_OBJECT('table', '${tableName}', 'query', current_query(), 'record', NEW, 'previousRecord', OLD)::text);
-    RETURN NEW;
+	SELECT INTO query_metadata
+			(regexp_match(
+					current_query(),
+					'^--QUERY_METADATA\\(({.*})', 'n'
+			))[1]::json;
+
+	PERFORM pg_notify(
+		'insert',
+		json_build_object(
+						'table', '${tableName}',
+						'queryMetadata', query_metadata,
+						'insertedId', NEW.id,
+						'record', json_build_object(
+							${notifyColumnNewBuildString}
+						)
+		)::text
+		);
+		
+	RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE TRIGGER "${tableName}_insert"
-    AFTER INSERT ON "${tableName}"
-    FOR EACH ROW
+CREATE OR REPLACE TRIGGER "${tableName}_insert"
+	AFTER INSERT ON "${tableName}"
+	FOR EACH ROW
 EXECUTE FUNCTION notify_${tableName}_insert();
-		`;
+`;
   }
   schemaToPsqlType(column) {
     if (column.hasAutoIncrement) return "BIGSERIAL";
@@ -2493,15 +2659,6 @@ EXECUTE FUNCTION notify_${tableName}_insert();
     return column.type;
   }
 };
-__decorateClass([
-  boundMethod
-], PsqlEngine.prototype, "createUpdateTrigger", 1);
-__decorateClass([
-  boundMethod
-], PsqlEngine.prototype, "createDeleteTrigger", 1);
-__decorateClass([
-  boundMethod
-], PsqlEngine.prototype, "createInsertTriggers", 1);
 
 // src/restura/utils/TempCache.ts
 var import_fs3 = __toESM(require("fs"));