prostgles-server 4.2.624 → 4.2.625

package/dist/Audit/AuditTable.d.ts

@@ -26,5 +26,6 @@ export declare const AUDIT_TABLE_COLUMN_DEFINITIONS: {
     };
 };
 export type AuditTableRow = TableRowFromColumnDefinitions<typeof AUDIT_TABLE_COLUMN_DEFINITIONS>;
-export declare const AUDIT_TABLE_COLUMNS: (keyof AuditTableRow)[];
+export declare const AUDIT_TABLE_COLUMN_NAMES: { [K in keyof AuditTableRow]: K; };
+export declare const AUDIT_TABLE_COLUMNS: ("id" | "table_name" | "created_at" | "schema_name" | "operation" | "old_id" | "new_id" | "old_row" | "new_row" | "actor" | "db_context")[];
 //# sourceMappingURL=AuditTable.d.ts.map

package/dist/Audit/AuditTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuditTable.d.ts","sourceRoot":"","sources":["../../lib/Audit/AuditTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAElG,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;CAuBjC,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,8BAA8B,CAAC,CAAC;AACjG,eAAO,MAAM,mBAAmB,EAE3B,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC"}
+{"version":3,"file":"AuditTable.d.ts","sourceRoot":"","sources":["../../lib/Audit/AuditTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAElG,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;CAuBjC,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,8BAA8B,CAAC,CAAC;AACjG,eAAO,MAAM,wBAAwB,EAEhC,GAAG,CAAC,IAAI,MAAM,aAAa,GAAG,CAAC,GAAE,CAAC;AACvC,eAAO,MAAM,mBAAmB,6IAA0C,CAAC"}

package/dist/Audit/AuditTable.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AUDIT_TABLE_COLUMNS = exports.AUDIT_TABLE_COLUMN_DEFINITIONS = void 0;
+exports.AUDIT_TABLE_COLUMNS = exports.AUDIT_TABLE_COLUMN_NAMES = exports.AUDIT_TABLE_COLUMN_DEFINITIONS = void 0;
 exports.AUDIT_TABLE_COLUMN_DEFINITIONS = {
     id: "BIGSERIAL PRIMARY KEY",
     created_at: "TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp()",
@@ -25,5 +25,6 @@ exports.AUDIT_TABLE_COLUMN_DEFINITIONS = {
         },
     },
 };
-exports.AUDIT_TABLE_COLUMNS = Object.keys(exports.AUDIT_TABLE_COLUMN_DEFINITIONS);
+exports.AUDIT_TABLE_COLUMN_NAMES = Object.fromEntries(Object.keys(exports.AUDIT_TABLE_COLUMN_DEFINITIONS).map((columnName) => [columnName, columnName]));
+exports.AUDIT_TABLE_COLUMNS = Object.values(exports.AUDIT_TABLE_COLUMN_NAMES);
 //# sourceMappingURL=AuditTable.js.map

package/dist/Audit/AuditTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuditTable.js","sourceRoot":"","sources":["../../lib/Audit/AuditTable.ts"],"names":[],"mappings":";;;AAEa,QAAA,8BAA8B,GAAG;IAC5C,EAAE,EAAE,uBAAuB;IAC3B,UAAU,EAAE,gDAAgD;IAC5D,WAAW,EAAE,eAAe;IAC5B,UAAU,EAAE,eAAe;IAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;IACnD,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE;QACV,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ,cAAc,EAAE,QAAQ;gBACxB,sBAAsB,EAAE,QAAQ;gBAChC,oBAAoB,EAAE,QAAQ;gBAC9B,YAAY,EAAE,QAAQ;gBACtB,YAAY,EAAE,QAAQ;gBACtB,gBAAgB,EAAE,QAAQ;aAC3B;SACF;KACF;CACO,CAAC;AAGE,QAAA,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAC5C,sCAA8B,CACJ,CAAC"}
+{"version":3,"file":"AuditTable.js","sourceRoot":"","sources":["../../lib/Audit/AuditTable.ts"],"names":[],"mappings":";;;AAEa,QAAA,8BAA8B,GAAG;IAC5C,EAAE,EAAE,uBAAuB;IAC3B,UAAU,EAAE,gDAAgD;IAC5D,WAAW,EAAE,eAAe;IAC5B,UAAU,EAAE,eAAe;IAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;IACnD,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE;QACV,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ,cAAc,EAAE,QAAQ;gBACxB,sBAAsB,EAAE,QAAQ;gBAChC,oBAAoB,EAAE,QAAQ;gBAC9B,YAAY,EAAE,QAAQ;gBACtB,YAAY,EAAE,QAAQ;gBACtB,gBAAgB,EAAE,QAAQ;aAC3B;SACF;KACF;CACO,CAAC;AAGE,QAAA,wBAAwB,GAAG,MAAM,CAAC,WAAW,CACxD,MAAM,CAAC,IAAI,CAAC,sCAA8B,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CACrD,CAAC;AAC1B,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAC,CAAC"}

package/dist/Audit/getAuditTableRules.d.ts

@@ -0,0 +1,7 @@
+import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
+import type { LocalParams } from "../DboBuilder/DboBuilder";
+import type { PublishParser } from "../PublishParser/PublishParser";
+import type { ParsedPublishTable, PublishObject } from "../PublishParser/publishTypesAndUtils";
+import type { ResolvedAuditConfig } from "./AuditTypes";
+export declare const getAuditTableRules: (this: PublishParser, audit: ResolvedAuditConfig, auditTablePublishRules: ParsedPublishTable | undefined, clientReq: AuthClientRequest | undefined, clientInfo: AuthResultWithSID | undefined, scope: LocalParams["scope"] | undefined, resolvedPublishObject: PublishObject | undefined) => Promise<ParsedPublishTable | undefined>;
+//# sourceMappingURL=getAuditTableRules.d.ts.map

package/dist/Audit/getAuditTableRules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAuditTableRules.d.ts","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAU,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EAEd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,eAAO,MAAM,kBAAkB,GAC7B,MAAM,aAAa,EACnB,OAAO,mBAAmB,EAC1B,wBAAwB,kBAAkB,GAAG,SAAS,EACtD,WAAW,iBAAiB,GAAG,SAAS,EACxC,YAAY,iBAAiB,GAAG,SAAS,EACzC,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS,EACvC,uBAAuB,aAAa,GAAG,SAAS,KAC/C,OAAO,CAAC,kBAAkB,GAAG,SAAS,CA6FxC,CAAC"}

package/dist/Audit/getAuditTableRules.js

@@ -0,0 +1,191 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAuditTableRules = void 0;
+const pg_promise_1 = require("pg-promise");
+const prostgles_types_1 = require("prostgles-types");
+const getQuerySource_1 = require("../DboBuilder/QueryBuilder/getQuerySource");
+const AuditTable_1 = require("./AuditTable");
+const prepareWhere_1 = require("../DboBuilder/ViewHandler/prepareWhere");
+const getAuditTableRules = async function (audit, auditTablePublishRules, clientReq, clientInfo, scope, resolvedPublishObject) {
+    if (auditTablePublishRules?.select) {
+        return auditTablePublishRules;
+    }
+    if (resolvedPublishObject && Object.hasOwn(resolvedPublishObject, audit.tableName)) {
+        return auditTablePublishRules;
+    }
+    const auditedTableNames = Object.keys(audit.tables).filter((tableName) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media);
+    const auditTableHandler = this.dbo[audit.tableName];
+    const auditedTableRules = (await Promise.all(auditedTableNames.map(async (tableName) => {
+        const tableHandler = this.dbo[tableName];
+        if (!tableHandler)
+            return;
+        const rules = await this.getTableRules({
+            tableName,
+            clientReq,
+            clientInfo,
+            scope,
+            resolvedPublishObject,
+        });
+        if (!rules?.select) {
+            return;
+        }
+        return {
+            handler: tableHandler,
+            additionalForcedCondition: await getSourceAuditCondition(tableHandler, rules.select.forcedFilter),
+            tableColumnOverrides: getAuditRowColumnOverrides(tableHandler.parseFieldFilter(rules.select.fields), audit.tables[tableName].idColumns),
+        };
+    }))).filter(prostgles_types_1.isDefined);
+    if (!auditedTableRules.length) {
+        return auditTablePublishRules;
+    }
+    const validateRequest = (filter) => {
+        const requiredTableNameFilterValue = getRequiredStringFilter(filter, [AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.schema_name, AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.table_name], this.prostgles.keywords.$and);
+        if (!requiredTableNameFilterValue) {
+            throw new Error("Audit queries require an exact schema_name and table_name filter");
+        }
+        const { schema_name, table_name } = requiredTableNameFilterValue;
+        const [matchingAuditedTableRules, ...otherMatches] = auditedTableRules.filter(({ handler: { tableOrViewInfo } }) => {
+            const sourceName = tableOrViewInfo.qualifiedNameParts;
+            return sourceName.name === table_name && sourceName.schema === schema_name;
+        });
+        if (otherMatches.length) {
+            throw new Error("Invalid audit table filter: multiple matching rules found");
+        }
+        if (!matchingAuditedTableRules) {
+            throw new Error("Invalid audit table filter: no matching rules found");
+        }
+        const { additionalForcedCondition, tableColumnOverrides } = matchingAuditedTableRules;
+        const tableExpression = getTableExpression(auditTableHandler, tableColumnOverrides, additionalForcedCondition);
+        return { tableExpression };
+    };
+    const select = (0, getQuerySource_1.withTableExpression)({
+        fields: "*",
+        filterFields: "*",
+        orderByFields: "*",
+        disableMethods: { subscribe: 1, sync: 1 },
+    }, (request) => validateRequest(request.filter).tableExpression);
+    return { ...auditTablePublishRules, select };
+};
+exports.getAuditTableRules = getAuditTableRules;
+const getAuditRowColumnOverrides = (allowedColumns, idColumns) => {
+    const getSnapshotExpression = (snapshotColumn, columns) => {
+        const snapshot = (0, prostgles_types_1.asName)(snapshotColumn);
+        const args = columns.flatMap((columnName) => [
+            pg_promise_1.as.text(columnName),
+            `${snapshot} -> ${pg_promise_1.as.text(columnName)}`,
+        ]);
+        return `CASE WHEN ${snapshot} IS NULL THEN NULL ELSE jsonb_build_object(${args.join(", ")}) END`;
+    };
+    return {
+        [AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.old_id]: getSnapshotExpression(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.old_id, idColumns.filter((columnName) => allowedColumns.includes(columnName))),
+        [AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.new_id]: getSnapshotExpression(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.new_id, idColumns.filter((columnName) => allowedColumns.includes(columnName))),
+        [AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.old_row]: getSnapshotExpression(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.old_row, allowedColumns),
+        [AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.new_row]: getSnapshotExpression(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.new_row, allowedColumns),
+    };
+};
+const getSourceAuditCondition = async (sourceHandler, forcedFilter) => {
+    const { schema, name } = sourceHandler.tableOrViewInfo.qualifiedNameParts;
+    const auditColumn = (columnName) => (0, prostgles_types_1.asName)(columnName);
+    const sourceCondition = [
+        `${auditColumn(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.schema_name)} = ${pg_promise_1.as.text(schema)}`,
+        `${auditColumn(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.table_name)} = ${pg_promise_1.as.text(name)}`,
+    ].join(" AND ");
+    if (!forcedFilter || !Object.keys(forcedFilter).length) {
+        return sourceCondition;
+    }
+    const getSnapshotCondition = async (snapshotColumn) => {
+        const alias = `prostgles_audit_${snapshotColumn}`;
+        const snapshot = auditColumn(snapshotColumn);
+        const { condition } = await (0, prepareWhere_1.prepareWhere)(sourceHandler, {
+            filter: forcedFilter,
+            select: undefined,
+            filterFields: "*",
+            addWhere: false,
+            tableAlias: { raw: alias, escaped: (0, prostgles_types_1.asName)(alias) },
+            localParams: undefined,
+            tableRule: undefined,
+        });
+        if (!condition)
+            return "TRUE";
+        const record = `NULL::${sourceHandler.escapedName}`;
+        return `(
+      ${snapshot} IS NULL OR EXISTS (
+        SELECT 1
+        FROM jsonb_populate_record(${record}, ${snapshot}) AS ${(0, prostgles_types_1.asName)(alias)}
+        WHERE ${condition}
+      )
+    )`;
+    };
+    const [oldRowCondition, newRowCondition] = await Promise.all([
+        getSnapshotCondition(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.old_row),
+        getSnapshotCondition(AuditTable_1.AUDIT_TABLE_COLUMN_NAMES.new_row),
+    ]);
+    /** Prevent updates that cross a forcedFilter boundary from exposing either snapshot. */
+    return `(${sourceCondition}) AND ${oldRowCondition} AND ${newRowCondition}`;
+};
+const canSelect = (rule) => {
+    return rule === "*" || rule === true || ((0, prostgles_types_1.isObject)(rule) && Boolean(rule.select));
+};
+const getRequiredStringFilter = (filter, fieldNames, andKey) => {
+    const values = getExactStringFilters(filter, fieldNames, andKey);
+    if (fieldNames.some((fieldName) => !values[fieldName]))
+        return;
+    return values;
+};
+const getExactStringFilters = (filter, fieldNames, andKey) => {
+    if (!(0, prostgles_types_1.isObject)(filter))
+        return {};
+    const filterRecord = filter;
+    const result = (0, prostgles_types_1.fromEntries)(fieldNames
+        .map((fieldName) => {
+        const value = filterRecord[fieldName];
+        if (typeof value === "string")
+            return [fieldName, value];
+        if (!(0, prostgles_types_1.isObject)(value))
+            return;
+        const entries = Object.entries(value);
+        const [operator, exactValue] = entries[0] ?? [];
+        if (entries.length === 1 &&
+            operator &&
+            ["=", "$eq"].includes(operator) &&
+            typeof exactValue === "string") {
+            return [fieldName, exactValue];
+        }
+    })
+        .filter(prostgles_types_1.isDefined));
+    const andFilters = filterRecord[andKey];
+    if (!Array.isArray(andFilters))
+        return result;
+    for (const andFilter of andFilters) {
+        const nestedValues = getExactStringFilters(andFilter, fieldNames, andKey);
+        for (const fieldName of fieldNames) {
+            const nestedValue = nestedValues[fieldName];
+            if (!nestedValue)
+                continue;
+            const existingValue = result[fieldName];
+            if (existingValue && existingValue !== nestedValue) {
+                throw new Error(`Conflicting exact ${fieldName} filters`);
+            }
+            result[fieldName] = nestedValue;
+        }
+    }
+    return result;
+};
+const getTableExpression = (auditTableHandler, columnOverrides, additionalCondition) => {
+    const overrides = columnOverrides && !(0, prostgles_types_1.isEmpty)(columnOverrides) ? columnOverrides : undefined;
+    if (!overrides && !additionalCondition)
+        return;
+    const invalidColumns = Object.keys(overrides ?? {}).filter((columnName) => !auditTableHandler.column_names.includes(columnName));
+    if (invalidColumns.length) {
+        throw new Error(`Invalid table column overrides: ${invalidColumns.join(", ")}`);
+    }
+    const columns = overrides ?
+        auditTableHandler.column_names.map((columnName) => {
+            const override = overrides[columnName];
+            return override ? `${override} AS ${(0, prostgles_types_1.asName)(columnName)}` : (0, prostgles_types_1.asName)(columnName);
+        })
+        : ["*"];
+    const where = additionalCondition ? ` WHERE ${additionalCondition}` : "";
+    return `(SELECT ${columns.join(", ")} FROM ${auditTableHandler.escapedName}${where})`;
+};
+//# sourceMappingURL=getAuditTableRules.js.map

package/dist/Audit/getAuditTableRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAuditTableRules.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":"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"}

package/dist/Audit/getAuditTriggerConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAuditTriggerConfig.d.ts","sourceRoot":"","sources":["../../lib/Audit/getAuditTriggerConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,eAAO,MAAM,qBAAqB,GAAI,OAAO,mBAAmB,KAAG,WA8ClE,CAAC"}
+{"version":3,"file":"getAuditTriggerConfig.d.ts","sourceRoot":"","sources":["../../lib/Audit/getAuditTriggerConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAIxD,eAAO,MAAM,qBAAqB,GAAI,OAAO,mBAAmB,KAAG,WA0DlE,CAAC"}

package/dist/Audit/getAuditTriggerConfig.js

@@ -4,8 +4,21 @@ exports.getAuditTriggerConfig = void 0;
 const pg_promise_1 = require("pg-promise");
 const prostgles_types_1 = require("prostgles-types");
 const getAuditTableConfig_1 = require("./getAuditTableConfig");
+const AuditTable_1 = require("./AuditTable");
 const getAuditTriggerConfig = (audit) => {
     const result = {};
+    const columns = AuditTable_1.AUDIT_TABLE_COLUMN_NAMES;
+    const insertColumns = [
+        columns.schema_name,
+        columns.table_name,
+        columns.operation,
+        columns.old_id,
+        columns.new_id,
+        columns.old_row,
+        columns.new_row,
+        columns.actor,
+        columns.db_context,
+    ].map((columnName) => (0, prostgles_types_1.asName)(columnName));
     for (const [name, options] of Object.entries(audit.tables)) {
         const { idColumns: ids, excludeColumns: excluded } = options;
         const functionName = (0, getAuditTableConfig_1.getAuditWriterName)(audit.tableName, name);
@@ -32,7 +45,7 @@ const getAuditTriggerConfig = (audit) => {
               after_row := after_row - excluded;
             END IF;
             IF TG_OP = 'UPDATE' AND before_row IS NOT DISTINCT FROM after_row THEN RETURN NULL; END IF;
-            INSERT INTO ${(0, prostgles_types_1.asName)(audit.tableName)} (schema_name, table_name, operation, old_id, new_id, old_row, new_row, actor, db_context)
+            INSERT INTO ${(0, prostgles_types_1.asName)(audit.tableName)} (${insertColumns.join(", ")})
               VALUES (TG_TABLE_SCHEMA, TG_TABLE_NAME, TG_OP, before_id, after_id, before_row, after_row,
                 nullif(current_setting('prostgles.user', true), '')::jsonb,
                 jsonb_build_object(

package/dist/Audit/getAuditTriggerConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAuditTriggerConfig.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTriggerConfig.ts"],"names":[],"mappings":";;;AAAA,2CAAgC;AAChC,qDAAyC;AAGzC,+DAA+E;AAExE,MAAM,qBAAqB,GAAG,CAAC,KAA0B,EAAe,EAAE;IAC/E,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7D,MAAM,YAAY,GAAG,IAAA,wCAAkB,EAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,GAAG;YACb,QAAQ,EAAE;gBACR,GAAG,IAAA,wCAAkB,EAAC,KAAK,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,CAAC;gBACpD,CAAC,YAAY,CAAC,EAAE;oBACd,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;oBACvC,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;;kCAEiB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;uCAChC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;0BAavD,IAAA,wBAAM,EAAC,KAAK,CAAC,SAAS,CAAC;;;;;;;;;;;;eAYlC;iBACN;aACF;SACF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}
+{"version":3,"file":"getAuditTriggerConfig.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTriggerConfig.ts"],"names":[],"mappings":";;;AAAA,2CAAgC;AAChC,qDAAyC;AAGzC,+DAA+E;AAC/E,6CAAwD;AAEjD,MAAM,qBAAqB,GAAG,CAAC,KAA0B,EAAe,EAAE;IAC/E,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,qCAAwB,CAAC;IACzC,MAAM,aAAa,GAAG;QACpB,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,UAAU;QAClB,OAAO,CAAC,SAAS;QACjB,OAAO,CAAC,MAAM;QACd,OAAO,CAAC,MAAM;QACd,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,KAAK;QACb,OAAO,CAAC,UAAU;KACnB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAA,wBAAM,EAAC,UAAU,CAAC,CAAC,CAAC;IAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7D,MAAM,YAAY,GAAG,IAAA,wCAAkB,EAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,GAAG;YACb,QAAQ,EAAE;gBACR,GAAG,IAAA,wCAAkB,EAAC,KAAK,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,CAAC;gBACpD,CAAC,YAAY,CAAC,EAAE;oBACd,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;oBACvC,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;;kCAEiB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;uCAChC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;0BAavD,IAAA,wBAAM,EAAC,KAAK,CAAC,SAAS,CAAC,KAAK,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;eAY/D;iBACN;aACF;SACF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA1DW,QAAA,qBAAqB,yBA0DhC"}

package/dist/DBSchemaBuilder/getDBGeneratedSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDBGeneratedSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AAGvC,eAAO,MAAM,oBAAoB,GAAI,2CAIlC;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC,KAAG,MAiFH,CAAC"}
+{"version":3,"file":"getDBGeneratedSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AAGvC,eAAO,MAAM,oBAAoB,GAAI,2CAIlC;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC,KAAG,MAiFH,CAAC"}

package/dist/DBSchemaBuilder/getDBGeneratedSchema.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDBGeneratedSchema = void 0;
 const prostgles_types_1 = require("prostgles-types");
-const applyScopeToTableRules_1 = require("../PublishParser/applyScopeToTableRules");
 const utils_1 = require("../utils/utils");
 const constants_1 = require("./constants");
 const getClientDBGeneratedSchemas_1 = require("./getClientDBGeneratedSchemas");
@@ -19,7 +18,7 @@ const getDBGeneratedSchema = ({ config, tablesOrViews, clientSchemas, }) => {
         /**
          * E.g.: A "users" will have referencedBy: { user_posts: ["user_id"] }
          */
-        const referencedBy = (0, applyScopeToTableRules_1.fromEntries)(tablesOrViews
+        const referencedBy = (0, prostgles_types_1.fromEntries)(tablesOrViews
             .map((refTable) => {
             const referencedCols = refTable.columns
                 .map((refCol) => {

package/dist/DBSchemaBuilder/getDBGeneratedSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDBGeneratedSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getDBGeneratedSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts

@@ -1,8 +1,11 @@
-import type { ColumnInfo, JoinSelect, PG_COLUMN_UDT_DATA_TYPE, Select, ValidatedColumnInfo } from "prostgles-types";
+import type { ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, Select, ValidatedColumnInfo } from "prostgles-types";
 import type { PGIdentifier, SortItem } from "../DboBuilder";
+import type { Awaitable } from "../../PublishParser/publishTypesAndUtils";
 import type { ParsedJoinPath } from "../ViewHandler/parseJoinPath";
-import type { ViewHandler } from "../ViewHandler/ViewHandler";
+import type { WhereOptions } from "../ViewHandler/prepareWhere";
 import type { FieldSpec, FunctionSpec } from "./Functions/Functions";
+import { type ParsedJoin } from "./parseJoinSelect";
+import type { QuerySource } from "./getQuerySource";
 export type SelectItem = {
     getFields: (args: any[]) => string[] | "*";
     getQuery: (tableAliasRaw?: string) => string;
@@ -21,7 +24,6 @@ export type SelectItem = {
 export type SelectItemValidated = Omit<SelectItem, "getFields"> & {
     fields: string[];
 };
-export type WhereOptions = Awaited<ReturnType<ViewHandler["prepareWhere"]>>;
 export type NewQueryRoot = {
     /**
      * All fields from the table will be in nested SELECT and GROUP BY to allow order/filter by fields not in select
@@ -32,6 +34,7 @@ export type NewQueryRoot = {
      */
     select: SelectItemValidated[];
     table: PGIdentifier;
+    source: QuerySource;
     where: string;
     whereOpts: WhereOptions;
     orderByItems: SortItem[];
@@ -73,7 +76,9 @@ export declare class SelectItemBuilder {
     private checkField;
     private addItem;
     private addFunction;
-    addColumn: (fieldName: string, selected: boolean) => void;
-    parseUserSelect: (userSelect: Select, joinParse?: (key: string, val: JoinSelect, throwErr: (msg: string) => any) => any) => Promise<never[] | undefined>;
+    private addColumn;
+    parse: (userSelect: Select, joinParse?: (key: string, parsedJoin: ParsedJoin) => Awaitable<void>) => Promise<void>;
+    parseUserSelect: (userSelect: Select) => Promise<void>;
+    parseUserSelectWithJoins: (userSelect: Select, joinParse?: (key: string, parsedJoin: ParsedJoin) => Awaitable<void>) => Promise<void>;
 }
 //# sourceMappingURL=QueryBuilder.d.ts.map

package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/QueryBuilder/QueryBuilder.js

@@ -6,9 +6,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectItemBuilder = exports.parseFunctionObject = void 0;
 const prostgles_types_1 = require("prostgles-types");
+const asNameAlias_1 = require("../../utils/asNameAlias");
 const COMPUTED_FIELDS_1 = require("./Functions/COMPUTED_FIELDS");
 const parseFunction_1 = require("./Functions/parseFunction");
-const asNameAlias_1 = require("../../utils/asNameAlias");
+const parseJoinSelect_1 = require("./parseJoinSelect");
 const parseFunctionObject = (funcData) => {
     const makeErr = (msg) => `Function not specified correctly. Expecting { $funcName: ["columnName" | <value>, ...args] } object but got: ${JSON.stringify(funcData)} \n ${msg}`;
     if (!(0, prostgles_types_1.isObject)(funcData))
@@ -64,7 +65,7 @@ class SelectItemBuilder {
         /** Not selected items can be part of the orderBy fields */
         const allowedFields = isSelected ? allowedSelectedFields : allowedNonSelectedFields;
         if (!allowedFields.includes(f)) {
-            throw ("Field " + f + " is invalid or dissallowed. \nAllowed fields: " + allowedFields.join(", "));
+            throw ("Field " + f + " is invalid or disallowed. \nAllowed fields: " + allowedFields.join(", "));
         }
         return f;
     };
@@ -130,96 +131,114 @@ class SelectItemBuilder {
             selected,
         });
     };
-    parseUserSelect = async (userSelect, joinParse) => {
+    parse = async (userSelect, joinParse) => {
+        if (userSelect === "") {
+            return;
+        }
+        if (userSelect === "*") {
+            this.allowedFields.map((key) => this.addColumn(key, true));
+            return;
+        }
         /* [col1, col2, col3] */
         if (Array.isArray(userSelect)) {
             if (userSelect.find((key) => typeof key !== "string")) {
                 throw "Invalid array select. Expecting an array of strings";
             }
             userSelect.map((key) => this.addColumn(key, true));
-            /* Empty select */
+            return;
         }
-        else if (userSelect === "") {
-            return [];
+        if (!(0, prostgles_types_1.isObject)(userSelect)) {
+            throw "Unexpected select -> " + JSON.stringify(userSelect);
         }
-        else if (userSelect === "*") {
-            this.allowedFields.map((key) => this.addColumn(key, true));
+        if ((0, prostgles_types_1.isEmpty)(userSelect)) {
+            throw "Unexpected empty object select";
         }
-        else if ((0, prostgles_types_1.isObject)(userSelect) && !(0, prostgles_types_1.isEmpty)(userSelect)) {
-            const selectKeys = Object.keys(userSelect), selectValues = Object.values(userSelect);
-            /* Cannot include and exclude at the same time */
-            if (selectValues.filter((v) => [0, false].includes(v)).length) {
-                if (selectValues.filter((v) => ![0, false].includes(v)).length) {
-                    throw "\nCannot include and exclude fields at the same time";
-                }
-                /* Exclude only */
-                this.allowedFields
-                    .filter((f) => !selectKeys.includes(f))
-                    .map((key) => this.addColumn(key, true));
+        const selectKeys = Object.keys(userSelect), selectValues = Object.values(userSelect);
+        /* Cannot include and exclude at the same time */
+        if (selectValues.filter((v) => [0, false].includes(v)).length) {
+            if (selectValues.filter((v) => ![0, false].includes(v)).length) {
+                throw "\nCannot include and exclude fields at the same time";
             }
-            else {
-                await Promise.all(selectKeys.map(async (key) => {
-                    const val = userSelect[key];
-                    const throwErr = (extraErr = "") => {
-                        console.trace(extraErr);
-                        throw "Unexpected select -> " + JSON.stringify({ [key]: val }) + "\n" + extraErr;
-                    };
-                    /* Included fields */
-                    if ([1, true].includes(val)) {
-                        if (key === "*") {
-                            this.allowedFields.map((key) => this.addColumn(key, true));
-                        }
-                        else {
-                            this.addColumn(key, true);
-                        }
-                        /* Aggs and functions */
+            /* Exclude only */
+            this.allowedFields
+                .filter((f) => !selectKeys.includes(f))
+                .map((key) => this.addColumn(key, true));
+        }
+        else {
+            await Promise.all(selectKeys.map(async (key) => {
+                const val = userSelect[key];
+                const throwErr = (message) => {
+                    console.trace(message);
+                    throw "Unexpected select -> " + JSON.stringify({ [key]: val }) + "\n" + message;
+                };
+                /* Included fields */
+                if ([1, true].includes(val)) {
+                    if (key === "*") {
+                        this.allowedFields.map((key) => this.addColumn(key, true));
+                    }
+                    else {
+                        this.addColumn(key, true);
                     }
-                    else if (typeof val === "string" || (0, prostgles_types_1.isObject)(val)) {
-                        /* Function shorthand notation
-                          { id: "$max" } === { id: { $max: ["id"] } } === SELECT MAX(id) AS id
+                    /* Aggregations and functions */
+                }
+                else if (typeof val === "string" || (0, prostgles_types_1.isObject)(val)) {
+                    /* Function shorthand notation
+                        { id: "$max" } === { id: { $max: ["id"] } } === SELECT MAX(id) AS id
                       */
-                        if ((typeof val === "string" && val !== "*") ||
-                            ((0, prostgles_types_1.isObject)(val) &&
-                                Object.keys(val).length === 1 &&
-                                Array.isArray(Object.values(val)[0]))) {
-                            let funcName, args;
-                            if (typeof val === "string") {
-                                /* Shorthand notation -> it is expected that the key is the column name used as the only argument */
-                                try {
-                                    this.checkField(key, true);
-                                }
-                                catch {
-                                    throwErr(` Shorthand function notation error: the specifield column ( ${key} ) is invalid or dissallowed. \n Use correct column name or full aliased function notation, e.g.: -> { alias: { $func_name: ["column_name"] } } `);
-                                }
-                                funcName = val;
-                                args = [key];
-                                /** Function full notation { $funcName: ["colName", ...args] } */
+                    if ((typeof val === "string" && val !== "*") ||
+                        ((0, prostgles_types_1.isObject)(val) &&
+                            Object.keys(val).length === 1 &&
+                            Array.isArray(Object.values(val)[0]))) {
+                        let funcName, args;
+                        if (typeof val === "string") {
+                            /* Shorthand notation -> it is expected that the key is the column name used as the only argument */
+                            try {
+                                this.checkField(key, true);
                             }
-                            else {
-                                ({ funcName, args } = (0, exports.parseFunctionObject)(val));
+                            catch {
+                                throwErr(` Shorthand function notation error: the specified column ( ${key} ) is invalid or disallowed. \n Use correct column name or full aliased function notation, e.g.: -> { alias: { $func_name: ["column_name"] } } `);
                             }
-                            this.addFunction(funcName, args, key);
-                            /* Join */
+                            funcName = val;
+                            args = [key];
+                            /** Function full notation { $funcName: ["colName", ...args] } */
                         }
                         else {
-                            if (!joinParse) {
-                                throw "Joins disallowed";
-                            }
-                            await joinParse(key, val, throwErr);
+                            ({ funcName, args } = (0, exports.parseFunctionObject)(val));
                         }
+                        this.addFunction(funcName, args, key);
+                        /* Join */
                     }
-                    else
-                        throwErr();
-                }));
-            }
+                    else {
+                        if (!joinParse) {
+                            throw "Joins disallowed";
+                        }
+                        const joinSelect = val;
+                        const parsedJoin = (0, parseJoinSelect_1.parseJoinSelect)(joinSelect);
+                        if (typeof parsedJoin === "string") {
+                            throwErr(parsedJoin);
+                        }
+                        await joinParse(key, parsedJoin);
+                    }
+                }
+                else
+                    throwErr("Invalid select value");
+            }));
         }
-        else {
-            if ((0, prostgles_types_1.isEmpty)(userSelect)) {
-                throw "Unexpected empty object select";
+        if (!joinParse)
+            return;
+        /**
+         * Is this still needed?!!!
+         * Add non selected columns
+         * This ensures all fields are available for orderBy in case of nested select
+         * */
+        Array.from(new Set([...this.allowedFields, ...this.allowedOrderByFields])).map((columnName) => {
+            if (!this.select.find((s) => s.alias === columnName && s.type === "column")) {
+                this.addColumn(columnName, false);
             }
-            throw "Unexpected select -> " + JSON.stringify(userSelect);
-        }
+        });
     };
+    parseUserSelect = (userSelect) => this.parse(userSelect);
+    parseUserSelectWithJoins = this.parse;
 }
 exports.SelectItemBuilder = SelectItemBuilder;
 //# sourceMappingURL=QueryBuilder.js.map