prostgles-server 4.2.611 → 4.2.613

package/dist/DboBuilder/joins/prepareShortestJoinPaths.spec.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const strict_1 = __importDefault(require("node:assert/strict"));
+const node_test_1 = __importDefault(require("node:test"));
+const prepareShortestJoinPaths_1 = require("./prepareShortestJoinPaths");
+void (0, node_test_1.default)("duplicate configured table pairs are rejected even during table configuration", () => {
+    const join = {
+        tables: ["conditions", "members"],
+        on: [{ project_id: "project_id" }],
+        type: "many-many",
+    };
+    for (const preparingTableConfig of [false, true]) {
+        for (const override of [false, true]) {
+            for (const tables of [join.tables, [...join.tables].reverse()]) {
+                const builder = {
+                    prostgles: {
+                        preparingTableConfig,
+                        opts: { joins: [join, { ...join, tables, override }] },
+                    },
+                    tablesOrViews: [],
+                };
+                strict_1.default.throws(() => (0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder), /Duplicate configured join for table pair/);
+            }
+        }
+    }
+});
+void (0, node_test_1.default)("configured joins are deferred only during table configuration", () => {
+    const builder = {
+        prostgles: {
+            preparingTableConfig: true,
+            opts: {
+                joins: [
+                    {
+                        tables: ["conditions", "members"],
+                        on: [{ project_id: "project_id" }],
+                        type: "many-many",
+                    },
+                ],
+            },
+        },
+        tablesOrViews: [],
+    };
+    strict_1.default.deepEqual((0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder).joins, []);
+    builder.prostgles.preparingTableConfig = false;
+    strict_1.default.throws(() => (0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder), (error) => typeof error === "string" && error.includes("Table not found: conditions"));
+});
+void (0, node_test_1.default)("existing configured joins remain available during table configuration", () => {
+    const join = {
+        tables: ["conditions", "members"],
+        on: [{ project_id: "project_id" }],
+        type: "many-many",
+    };
+    const builder = {
+        prostgles: { preparingTableConfig: true, opts: { joins: [join] } },
+        tablesOrViews: ["conditions", "members"].map((name) => ({
+            name,
+            columns: [{ name: "project_id" }],
+        })),
+    };
+    strict_1.default.deepEqual((0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder).joins, [join]);
+    builder.prostgles.preparingTableConfig = false;
+    strict_1.default.deepEqual((0, prepareShortestJoinPaths_1.prepareShortestJoinPaths)(builder).joins, [join]);
+});
+//# sourceMappingURL=prepareShortestJoinPaths.spec.js.map

package/dist/DboBuilder/joins/prepareShortestJoinPaths.spec.js.map

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

package/dist/DboBuilder/joins/shortestPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shortestPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/joins/shortestPath.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,KAAK,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,KAAK,EACZ,WAAW,MAAM,EACjB,SAAS,MAAM,KACd;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAgEpC,CAAC"}

package/dist/{shortestPath.js → DboBuilder/joins/shortestPath.js}

@@ -1,16 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findShortestPath = void 0;
-const shortestDistanceNode = (distances, visited) => {
-    let shortest = null;
-    for (const node in distances) {
-        const currentIsShortest = shortest === null || distances[node] < distances[shortest];
-        if (currentIsShortest && !visited.includes(node)) {
-            shortest = node;
-        }
-    }
-    return shortest;
-};
 const findShortestPath = (graph, startNode, endNode) => {
     // establish object for recording distances from the start node
     let distances = {};
@@ -71,7 +61,17 @@ const findShortestPath = (graph, startNode, endNode) => {
     return results;
 };
 exports.findShortestPath = findShortestPath;
-/* Usage:
+const shortestDistanceNode = (distances, visited) => {
+    let shortest = null;
+    for (const node in distances) {
+        const currentIsShortest = shortest === null || distances[node] < distances[shortest];
+        if (currentIsShortest && !visited.includes(node)) {
+            shortest = node;
+        }
+    }
+    return shortest;
+};
+/* Example:
 
 const graph = {
     start: { A: 5, B: 2 },

package/dist/DboBuilder/joins/shortestPath.js.map

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

package/dist/ProstglesTypes.d.ts

@@ -81,6 +81,8 @@ export type Join = {
         [key: string]: string;
     }[];
     type: (typeof JOIN_TYPES)[number];
+    /** Replace inferred joins for this table pair. Defaults to false. */
+    override?: boolean;
 };
 type Joins = Join[] | "inferred";
 type ModifyClientSchema<SUser extends SessionUser = SessionUser> = (table: DBSchemaTable, tableConfig: TableConfig[string] | undefined, userData: AuthResultWithSID<SUser> | undefined, resolvedAuditConfig: ResolvedAuditConfig | undefined) => MaybePromise<DBSchemaTable>;
@@ -168,9 +170,8 @@ export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUs
      */
     testRulesOnConnect?: boolean;
     /**
-     * Allows defining table relationships that can then be used in filters and data inserts:
-     *  - `inferred` - uses the foreign keys to infer the joins
-     *  - `Join[]` - specifies the joins manually
+     * Allows defining custom table relationships that can then be used in filters and data inserts.
+     * By default FKs are used to infer the joins.
      */
     joins?: Joins;
     /**

package/dist/ProstglesTypes.d.ts.map

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

package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts

@@ -1,9 +1,17 @@
+import type { JSONB } from "prostgles-types";
 /** Row types for the column definitions used by managed tables. */
 export type TableRowFromColumnDefinitions<T extends Record<string, string | {
     enum: readonly (string | number)[];
     nullable?: boolean;
+} | {
+    jsonbSchema: JSONB.JSONBSchema;
+    nullable?: boolean;
 }>> = {
     [K in keyof T]: T[K] extends {
+        jsonbSchema: infer S extends JSONB.JSONBSchema;
+    } ? JSONB.GetType<S> | (T[K] extends {
+        nullable: true;
+    } ? null : never) : T[K] extends {
         enum: readonly (infer V)[];
     } ? V | (T[K] extends {
         nullable: true;

package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,MAAM,MAAM,6BAA6B,CACvC,CAAC,SAAS,MAAM,CACd,MAAM,EACN,MAAM,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CACpE,IACC;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;KAAE,GACvD,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,GAAG,KAAK,CAAC,GAClD,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,MAAM,EAAE,GAC1B,MAAM,GACN,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,MAAM,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,MAAM,CAAC,GACb,CAAC,CAAC,CAAC,CAAC,CAAC,SACH,GAAG,MAAM,YAAY,MAAM,EAAE,GAAG,GAAG,MAAM,cAAc,MAAM,EAAE,GAC7D,KAAK,GACL,IAAI,CAAC;CAChB,CAAC"}
+{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,mEAAmE;AACnE,MAAM,MAAM,6BAA6B,CACvC,CAAC,SAAS,MAAM,CACd,MAAM,EACJ,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC1D;IAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CACzD,IACC;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,WAAW,EAAE,MAAM,CAAC,SAAS,KAAK,CAAC,WAAW,CAAA;KAAE,GAC3E,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,GAAG,KAAK,CAAC,GACnE,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;KAAE,GACzC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,GAAG,KAAK,CAAC,GAClD,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,MAAM,EAAE,GAC1B,MAAM,GACN,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,MAAM,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,MAAM,CAAC,GACb,CAAC,CAAC,CAAC,CAAC,CAAC,SACH,GAAG,MAAM,YAAY,MAAM,EAAE,GAAG,GAAG,MAAM,cAAc,MAAM,EAAE,GAC7D,KAAK,GACL,IAAI,CAAC;CAClB,CAAC"}

package/dist/utils/utils.d.ts

@@ -3,4 +3,5 @@ export declare const clone: <T extends any[] | Record<string, any>>(obj: T) => T
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare const escapeTSNames: (str: string, capitalize?: boolean) => string;
 export declare const isArray: <T>(data: T) => data is Extract<T, readonly unknown[]>;
+export declare const sortedArraysMatch: (a: string[], b: string[]) => boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,KAAG,CAMrE,CAAC;AAEF,eAAO,MAAM,KAAK,GAAa,IAAI,MAAM,qBAIxC,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,EAAE,oBAAkB,WAK5D,CAAC;AAQF,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,MAAM,CAAC,KAAG,IAAI,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,OAAO,EAAE,CAAwB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,KAAG,CAMrE,CAAC;AAEF,eAAO,MAAM,KAAK,GAAa,IAAI,MAAM,qBAIxC,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,EAAE,oBAAkB,WAK5D,CAAC;AAQF,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,MAAM,CAAC,KAAG,IAAI,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,OAAO,EAAE,CAAwB,CAAC;AAEnG,eAAO,MAAM,iBAAiB,GAAI,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,KAAG,OAE5D,CAAC"}

package/dist/utils/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isArray = exports.escapeTSNames = exports.sleep = exports.clone = exports.get = void 0;
-var prostgles_types_1 = require("prostgles-types");
-Object.defineProperty(exports, "get", { enumerable: true, get: function () { return prostgles_types_1.get; } });
+exports.sortedArraysMatch = exports.isArray = exports.escapeTSNames = exports.sleep = exports.clone = exports.get = void 0;
+const prostgles_types_1 = require("prostgles-types");
+var prostgles_types_2 = require("prostgles-types");
+Object.defineProperty(exports, "get", { enumerable: true, get: function () { return prostgles_types_2.get; } });
 const clone = (obj) => {
     if (typeof structuredClone !== "undefined") {
         return structuredClone(obj);
@@ -33,4 +34,8 @@ const canBeUsedAsIsInTypescript = (str) => {
 };
 const isArray = (data) => Array.isArray(data);
 exports.isArray = isArray;
+const sortedArraysMatch = (a, b) => {
+    return (0, prostgles_types_1.isEqual)(a.toSorted(), b.toSorted());
+};
+exports.sortedArraysMatch = sortedArraysMatch;
 //# sourceMappingURL=utils.js.map

package/dist/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils/utils.ts"],"names":[],"mappings":";;;AAAA,mDAAsC;AAA7B,sGAAA,GAAG,OAAA;AACL,MAAM,KAAK,GAAG,CAAwC,GAAM,EAAK,EAAE;IACxE,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;QAC3C,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAM,CAAC;AAC9C,CAAC,CAAC;AANW,QAAA,KAAK,SAMhB;AAEK,MAAM,KAAK,GAAG,UAAU,EAAU;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAJW,QAAA,KAAK,SAIhB;AAEK,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE;IAC/D,IAAI,GAAG,GAAG,GAAG,CAAC;IACd,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,yBAAyB,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AACF,MAAM,yBAAyB,GAAG,CAAC,GAAW,EAAW,EAAE;IACzD,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,MAAM,yBAAyB,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,MAAM,0BAA0B,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC,yBAAyB,IAAI,0BAA0B,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,CAAI,IAAO,EAA0C,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAAtF,QAAA,OAAO,WAA+E"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils/utils.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,mDAAsC;AAA7B,sGAAA,GAAG,OAAA;AACL,MAAM,KAAK,GAAG,CAAwC,GAAM,EAAK,EAAE;IACxE,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;QAC3C,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAM,CAAC;AAC9C,CAAC,CAAC;AANW,QAAA,KAAK,SAMhB;AAEK,MAAM,KAAK,GAAG,UAAU,EAAU;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAJW,QAAA,KAAK,SAIhB;AAEK,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE;IAC/D,IAAI,GAAG,GAAG,GAAG,CAAC;IACd,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,yBAAyB,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AACF,MAAM,yBAAyB,GAAG,CAAC,GAAW,EAAW,EAAE;IACzD,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,MAAM,yBAAyB,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,MAAM,0BAA0B,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC,yBAAyB,IAAI,0BAA0B,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,CAAI,IAAO,EAA0C,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAAtF,QAAA,OAAO,WAA+E;AAE5F,MAAM,iBAAiB,GAAG,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE;IACrE,OAAO,IAAA,yBAAO,EAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}

package/lib/Audit/AuditTable.ts

@@ -5,13 +5,24 @@ export const AUDIT_TABLE_COLUMN_DEFINITIONS = {
   created_at: "TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp()",
   schema_name: "TEXT NOT NULL",
   table_name: "TEXT NOT NULL",
-  entity_type: "TEXT NOT NULL",
   operation: { enum: ["INSERT", "UPDATE", "DELETE"] },
   old_id: "JSONB",
   new_id: "JSONB",
   old_row: "JSONB",
   new_row: "JSONB",
   actor: "JSONB",
+  db_context: {
+    jsonbSchema: {
+      type: {
+        transaction_id: "string",
+        transaction_started_at: "string",
+        statement_started_at: "string",
+        current_role: "string",
+        session_user: "string",
+        application_name: "string",
+      },
+    },
+  },
 } as const;
 
 export type AuditTableRow = TableRowFromColumnDefinitions<typeof AUDIT_TABLE_COLUMN_DEFINITIONS>;

package/lib/Audit/AuditTypes.ts

@@ -15,7 +15,6 @@ export type SchemaConfigAuditTableOptions<
   S,
   T extends SchemaConfigTableName<S>,
 > = {
-  entityType?: string;
   /** Defaults to all primary-key columns. Required for tables without a primary key. */
   idColumns?: readonly SchemaConfigColumnName<S, T>[];
   excludeColumns?: readonly SchemaConfigColumnName<S, T>[];
@@ -34,7 +33,7 @@ export type SchemaConfigAudit<S = void> = {
     SchemaConfigAuditIncludedTables<S> | SchemaConfigAuditExcludedTables<S>;
 };
 
-/** Validated audit targets with all column and entity defaults resolved. */
+/** Validated audit targets with all column defaults resolved. */
 export type ResolvedAuditConfig = {
   tableName: string;
   tables: Record<string, Required<SchemaConfigAuditTableOptions<void, string>>>;

package/lib/Audit/getAuditTriggerConfig.ts

@@ -7,7 +7,7 @@ import { getAuditProtection, getAuditWriterName } from "./getAuditTableConfig";
 export const getAuditTriggerConfig = (audit: ResolvedAuditConfig): TableConfig => {
   const result: TableConfig = {};
   for (const [name, options] of Object.entries(audit.tables)) {
-    const { entityType, idColumns: ids, excludeColumns: excluded } = options;
+    const { idColumns: ids, excludeColumns: excluded } = options;
     const functionName = getAuditWriterName(audit.tableName, name);
     result[name] = {
       triggers: {
@@ -32,9 +32,17 @@ export const getAuditTriggerConfig = (audit: ResolvedAuditConfig): TableConfig =
               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 ${asName(audit.tableName)} (schema_name, table_name, entity_type, operation, old_id, new_id, old_row, new_row, actor)
-              VALUES (TG_TABLE_SCHEMA, TG_TABLE_NAME, ${as.text(entityType)}, TG_OP, before_id, after_id, before_row, after_row,
-                nullif(current_setting('prostgles.user', true), '')::jsonb);
+            INSERT INTO ${asName(audit.tableName)} (schema_name, table_name, operation, old_id, new_id, old_row, new_row, actor, db_context)
+              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(
+                  'transaction_id', pg_current_xact_id()::text,
+                  'transaction_started_at', transaction_timestamp(),
+                  'statement_started_at', statement_timestamp(),
+                  'current_role', current_role,
+                  'session_user', session_user,
+                  'application_name', current_setting('application_name')
+                ));
             RETURN NULL;
           END;`,
         },

package/lib/Audit/parseAuditConfig.ts

@@ -58,11 +58,7 @@ export const parseAuditConfig = (prgl: Prostgles): ResolvedAuditConfig | undefin
     if (ids.some((c) => excluded.includes(c))) {
       throw new Error(`Audit identity columns cannot be excluded: ${table.name}`);
     }
-    if (options.entityType !== undefined && !options.entityType) {
-      throw new Error(`Invalid audit entityType for ${table.name}`);
-    }
     result[table.name] = {
-      entityType: options.entityType ?? table.name,
       idColumns: [...ids],
       excludeColumns: [...excluded],
     };

package/lib/DboBuilder/DboBuilder.ts

@@ -11,7 +11,7 @@ import type { PublishParser } from "../PublishParser/PublishParser";
 import type { OnCommitCallback } from "../PublishParser/publishTypesAndUtils";
 import type { ServerFunctionDefinition } from "../PublishParser/defineServerFunction";
 import { getQueryErrorPositionInfo } from "../TableConfig/runSQLFile";
-import type { Graph } from "../shortestPath";
+import type { Graph } from "./joins/shortestPath";
 import { clone } from "../utils/utils";
 import type {
   DBHandlerServer,
@@ -31,7 +31,7 @@ import {
   getConstraints,
   getSerializedClientErrorFromPGError,
 } from "./dboBuilderUtils";
-import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
+import { prepareShortestJoinPaths } from "./joins/prepareShortestJoinPaths";
 import { cacheDBTypes, runSQL } from "./runSql/runSQL";
 import { getDetailedFieldInfo, type getDbTypes } from "./runSql/runSqlUtils";
 import { getTablesForSchemaPostgresSQL } from "./schema/getTablesForSchemaPostgresSQL";
@@ -140,10 +140,7 @@ export class DboBuilder {
 
   onSchemaChange?: (event: { command: string; query: string }) => void;
 
-  private readonly onCommitCallbacksByTransaction = new WeakMap<
-    object,
-    OnCommitCallback[]
-  >();
+  private readonly onCommitCallbacksByTransaction = new WeakMap<object, OnCommitCallback[]>();
 
   registerOnCommitCallback = (transaction: object, callback: OnCommitCallback) => {
     const callbacks = this.onCommitCallbacksByTransaction.get(transaction);
@@ -250,9 +247,12 @@ export class DboBuilder {
       this.checkingCanSubscribe = false;
     }
     const start = Date.now();
-    const tablesOrViewsReq = await getTablesForSchemaPostgresSQL({ db: this.prostgles.dbForSchema! }, {
-      schemaFilter: this.prostgles.opts.schemaFilter,
-    });
+    const tablesOrViewsReq = await getTablesForSchemaPostgresSQL(
+      { db: this.prostgles.dbForSchema! },
+      {
+        schemaFilter: this.prostgles.opts.schemaFilter,
+      },
+    );
     await this.prostgles.opts.onLog?.({
       type: "debug",
       command: "DboBuilder.getTablesForSchemaPostgresSQL",
@@ -262,7 +262,10 @@ export class DboBuilder {
     const tablesOrViews = tablesOrViewsReq.result;
     this.tablesOrViews = tablesOrViews;
 
-    this.constraints = await getConstraints(this.prostgles.dbForSchema!, this.prostgles.opts.schemaFilter);
+    this.constraints = await getConstraints(
+      this.prostgles.dbForSchema!,
+      this.prostgles.opts.schemaFilter,
+    );
     await this.prepareShortestJoinPaths();
 
     this.dbo = {};

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -13,7 +13,7 @@ import type { TableEvent } from "../../Logging";
 import type { DB } from "../../Prostgles";
 import type { Join } from "../../ProstglesTypes";
 import type { ParsedTableRule } from "../../PublishParser/PublishParser";
-import type { Graph } from "../../shortestPath";
+import type { Graph } from "../joins/shortestPath";
 import type { DboBuilder, Filter, LocalParams, TableHandlers } from "../DboBuilder";
 import { getSerializedClientErrorFromPGError } from "../DboBuilder";
 import type { TableSchema } from "../DboBuilderTypes";

package/lib/DboBuilder/joins/getInferredJoins.ts

@@ -0,0 +1,59 @@
+import type { TableSchema } from "../DboBuilderTypes";
+import type { Join } from "../../ProstglesTypes";
+import { sortedArraysMatch } from "../../utils/utils";
+import { isEqual } from "prostgles-types";
+
+export const getInferredJoins = (schema: TableSchema[]): Join[] => {
+  const joins: Join[] = [];
+  const upsertJoin = (
+    t1: string,
+    t2: string,
+    cols: { col1: string; col2: string }[],
+    type: Join["type"],
+  ) => {
+    const existingIdx = joins.findIndex((j) => sortedArraysMatch(j.tables, [t1, t2]));
+    const existing = joins[existingIdx];
+    const normalCond = cols.reduce((a, v) => ({ ...a, [v.col1]: v.col2 }), {});
+    const revertedCond = cols.reduce((a, v) => ({ ...a, [v.col2]: v.col1 }), {});
+    if (existing) {
+      const isLTR = existing.tables[0] === t1;
+      const cond = isLTR ? normalCond : revertedCond;
+
+      /** At some point we should add relationship type to EACH JOIN CONDITION GROUP */
+      // const fixedType = isLTR? type : type.split("").reverse().join("") as Join["type"];
+
+      /** Avoid duplicates */
+      if (!existing.on.some((existingOnCondition) => isEqual(existingOnCondition, cond))) {
+        existing.on.push(cond);
+        joins[existingIdx] = existing;
+      }
+    } else {
+      joins.push({
+        tables: [t1, t2],
+        on: [normalCond],
+        type,
+      });
+    }
+  };
+  schema.map((tov) => {
+    tov.columns.map((col) => {
+      if (col.references) {
+        col.references.forEach((r) => {
+          const joinCols = r.cols.map((c, i) => ({
+            col1: c,
+            col2: r.fcols[i]!,
+          }));
+          let type: Join["type"] = "one-many";
+          const ftablePKeys = schema
+            .find(({ name }) => name === r.ftable)
+            ?.columns.filter((fcol) => fcol.is_pkey);
+          if (ftablePKeys?.length && ftablePKeys.every((fkey) => r.fcols.includes(fkey.name))) {
+            type = "one-one";
+          }
+          upsertJoin(tov.name, r.ftable, joinCols, type);
+        });
+      }
+    });
+  });
+  return joins;
+};

package/lib/DboBuilder/joins/prepareShortestJoinPaths.spec.ts

@@ -0,0 +1,72 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type { DboBuilder } from "../DboBuilder";
+import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
+import type { Join } from "../../ProstglesTypes";
+
+void test("duplicate configured table pairs are rejected even during table configuration", () => {
+  const join: Join = {
+    tables: ["conditions", "members"],
+    on: [{ project_id: "project_id" }],
+    type: "many-many",
+  };
+  for (const preparingTableConfig of [false, true]) {
+    for (const override of [false, true]) {
+      for (const tables of [join.tables, [...join.tables].reverse() as Join["tables"]]) {
+        const builder = {
+          prostgles: {
+            preparingTableConfig,
+            opts: { joins: [join, { ...join, tables, override }] },
+          },
+          tablesOrViews: [],
+        } as unknown as DboBuilder;
+        assert.throws(
+          () => prepareShortestJoinPaths(builder),
+          /Duplicate configured join for table pair/,
+        );
+      }
+    }
+  }
+});
+
+void test("configured joins are deferred only during table configuration", () => {
+  const builder = {
+    prostgles: {
+      preparingTableConfig: true,
+      opts: {
+        joins: [
+          {
+            tables: ["conditions", "members"],
+            on: [{ project_id: "project_id" }],
+            type: "many-many",
+          },
+        ],
+      },
+    },
+    tablesOrViews: [],
+  } as unknown as DboBuilder;
+  assert.deepEqual(prepareShortestJoinPaths(builder).joins, []);
+  builder.prostgles.preparingTableConfig = false;
+  assert.throws(
+    () => prepareShortestJoinPaths(builder),
+    (error: unknown) => typeof error === "string" && error.includes("Table not found: conditions"),
+  );
+});
+
+void test("existing configured joins remain available during table configuration", () => {
+  const join = {
+    tables: ["conditions", "members"],
+    on: [{ project_id: "project_id" }],
+    type: "many-many",
+  };
+  const builder = {
+    prostgles: { preparingTableConfig: true, opts: { joins: [join] } },
+    tablesOrViews: ["conditions", "members"].map((name) => ({
+      name,
+      columns: [{ name: "project_id" }],
+    })),
+  } as unknown as DboBuilder;
+  assert.deepEqual(prepareShortestJoinPaths(builder).joins, [join]);
+  builder.prostgles.preparingTableConfig = false;
+  assert.deepEqual(prepareShortestJoinPaths(builder).joins, [join]);
+});