prostgles-server 4.2.605 → 4.2.607
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -0
- package/dist/Audit/AuditTable.d.ts +18 -0
- package/dist/Audit/AuditTable.d.ts.map +1 -0
- package/dist/Audit/AuditTable.js +18 -0
- package/dist/Audit/AuditTable.js.map +1 -0
- package/dist/Audit/AuditTypes.d.ts +25 -0
- package/dist/Audit/AuditTypes.d.ts.map +1 -0
- package/dist/Audit/AuditTypes.js +3 -0
- package/dist/Audit/AuditTypes.js.map +1 -0
- package/dist/Audit/getAuditTableConfig.d.ts +13 -0
- package/dist/Audit/getAuditTableConfig.d.ts.map +1 -0
- package/dist/Audit/getAuditTableConfig.js +54 -0
- package/dist/Audit/getAuditTableConfig.js.map +1 -0
- package/dist/Audit/parseAuditConfig.d.ts +5 -0
- package/dist/Audit/parseAuditConfig.d.ts.map +1 -0
- package/dist/Audit/parseAuditConfig.js +123 -0
- package/dist/Audit/parseAuditConfig.js.map +1 -0
- package/dist/DboBuilder/DboBuilder.js +2 -2
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.js +5 -46
- package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getRawInfo.d.ts +7 -0
- package/dist/DboBuilder/ViewHandler/getRawInfo.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/getRawInfo.js +51 -0
- package/dist/DboBuilder/ViewHandler/getRawInfo.js.map +1 -0
- package/dist/DboBuilder/getColumns.d.ts +5 -0
- package/dist/DboBuilder/getColumns.d.ts.map +1 -1
- package/dist/DboBuilder/getColumns.js +80 -74
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/runSql/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/runSql/QueryStreamer.js +1 -0
- package/dist/DboBuilder/runSql/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts +3 -3
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js +2 -2
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/DboBuilder/schema/getViewReferenceColumns.d.ts +2 -2
- package/dist/DboBuilder/schema/getViewReferenceColumns.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getViewReferenceColumns.js +4 -2
- package/dist/DboBuilder/schema/getViewReferenceColumns.js.map +1 -1
- package/dist/Prostgles.d.ts +6 -0
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +33 -5
- package/dist/Prostgles.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +3 -0
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/ProstglesTypes.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.js +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.js.map +1 -1
- package/dist/PubSubManager/init/getPubSubManagerInitQuery.js +4 -4
- package/dist/PubSubManager/init/getPubSubManagerInitQuery.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js +5 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/TableConfig/TableConfigTypes.d.ts +1 -1
- package/dist/TableConfig/TableConfigTypes.d.ts.map +1 -1
- package/dist/TableConfig/TableConfigurator.js +3 -3
- package/dist/TableConfig/TableConfigurator.js.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.js +3 -2
- package/dist/TableConfig/getTableConfigSchemaQueries.js.map +1 -1
- package/dist/TableConfig/getTableTriggerQueries.d.ts +2 -2
- package/dist/TableConfig/getTableTriggerQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableTriggerQueries.js +57 -34
- package/dist/TableConfig/getTableTriggerQueries.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +5 -6
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/dist/TableConfig/managedTriggerNames.d.ts +8 -0
- package/dist/TableConfig/managedTriggerNames.d.ts.map +1 -0
- package/dist/TableConfig/managedTriggerNames.js +17 -0
- package/dist/TableConfig/managedTriggerNames.js.map +1 -0
- package/dist/TableConfig/runSQLFile.js +1 -1
- package/dist/TableConfig/runSQLFile.js.map +1 -1
- package/dist/TableConfig/syncTableTriggers.d.ts +4 -0
- package/dist/TableConfig/syncTableTriggers.d.ts.map +1 -0
- package/dist/TableConfig/syncTableTriggers.js +32 -0
- package/dist/TableConfig/syncTableTriggers.js.map +1 -0
- package/dist/deferDbQueries.d.ts +4 -0
- package/dist/deferDbQueries.d.ts.map +1 -0
- package/dist/deferDbQueries.js +24 -0
- package/dist/deferDbQueries.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/initProstgles.d.ts +1 -1
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +24 -13
- package/dist/initProstgles.js.map +1 -1
- package/dist/updateConfiguration.d.ts.map +1 -1
- package/dist/updateConfiguration.js +1 -6
- package/dist/updateConfiguration.js.map +1 -1
- package/lib/Audit/AuditTable.ts +25 -0
- package/lib/Audit/AuditTypes.ts +35 -0
- package/lib/Audit/getAuditTableConfig.ts +76 -0
- package/lib/Audit/parseAuditConfig.ts +158 -0
- package/lib/DboBuilder/DboBuilder.ts +2 -2
- package/lib/DboBuilder/ViewHandler/getInfo.ts +5 -58
- package/lib/DboBuilder/ViewHandler/getRawInfo.ts +65 -0
- package/lib/DboBuilder/getColumns.ts +105 -92
- package/lib/DboBuilder/runSql/QueryStreamer.ts +1 -0
- package/lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts +2 -2
- package/lib/DboBuilder/schema/getViewReferenceColumns.ts +7 -8
- package/lib/Prostgles.ts +34 -5
- package/lib/ProstglesTypes.ts +3 -0
- package/lib/PubSubManager/getCreatePubSubManagerError.ts +1 -1
- package/lib/PubSubManager/init/getPubSubManagerInitQuery.ts +4 -4
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +6 -1
- package/lib/TableConfig/TableConfigTypes.ts +1 -1
- package/lib/TableConfig/TableConfigurator.ts +2 -2
- package/lib/TableConfig/getTableConfigSchemaQueries.ts +3 -2
- package/lib/TableConfig/getTableTriggerQueries.ts +85 -41
- package/lib/TableConfig/initTableConfig.ts +4 -7
- package/lib/TableConfig/managedTriggerNames.ts +16 -0
- package/lib/TableConfig/runSQLFile.ts +1 -1
- package/lib/TableConfig/syncTableTriggers.ts +42 -0
- package/lib/deferDbQueries.ts +27 -0
- package/lib/index.ts +3 -0
- package/lib/initProstgles.ts +24 -12
- package/lib/updateConfiguration.ts +1 -6
- package/package.json +1 -1
- package/dist/TableConfig/getTableTriggerQueries.spec.d.ts +0 -2
- package/dist/TableConfig/getTableTriggerQueries.spec.d.ts.map +0 -1
- package/dist/TableConfig/getTableTriggerQueries.spec.js +0 -56
- package/dist/TableConfig/getTableTriggerQueries.spec.js.map +0 -1
- package/lib/TableConfig/getTableTriggerQueries.spec.ts +0 -77
|
@@ -4,7 +4,7 @@ exports.getQueryErrorPositionInfo = exports.runSQLFile = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const Prostgles_1 = require("../Prostgles");
|
|
6
6
|
const runSQLFile = async (prostgles) => {
|
|
7
|
-
const { db, opts: { sqlFilePath, onLog }, } = prostgles;
|
|
7
|
+
const { dbForSchema: db, opts: { sqlFilePath, onLog }, } = prostgles;
|
|
8
8
|
if (!sqlFilePath)
|
|
9
9
|
return;
|
|
10
10
|
if (!db)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQLFile.js","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AACnE,4CAA2D;AAEpD,MAAM,UAAU,GAAG,KAAK,EAAE,SAAoB,EAAE,EAAE;IACvD,MAAM,EACJ,EAAE,
|
|
1
|
+
{"version":3,"file":"runSQLFile.js","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"syncTableTriggers.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/syncTableTriggers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9C,yFAAyF;AACzF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,SAAS,iBAmCtD"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.syncTableTriggers = syncTableTriggers;
|
|
4
|
+
const parseAuditConfig_1 = require("../Audit/parseAuditConfig");
|
|
5
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
|
+
const getTableTriggerQueries_1 = require("./getTableTriggerQueries");
|
|
7
|
+
/** Applies application and generated audit triggers together, after all tables exist. */
|
|
8
|
+
async function syncTableTriggers(prgl) {
|
|
9
|
+
const previousAudit = prgl.parsedAuditConfig;
|
|
10
|
+
const nextAudit = prgl.opts.audit || previousAudit ? await (0, parseAuditConfig_1.parseAuditConfig)(prgl) : undefined;
|
|
11
|
+
prgl.parsedAuditConfig = nextAudit;
|
|
12
|
+
try {
|
|
13
|
+
const config = prgl.mergedTableConfig.tableConfig ?? {};
|
|
14
|
+
const queries = [];
|
|
15
|
+
for (const name of Object.keys(config)) {
|
|
16
|
+
if (!prgl.dboBuilder.tables.some((t) => t.name === name)) {
|
|
17
|
+
throw new Error(`Table config name must exactly match a schema table name: ${name}`);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
for (const table of prgl.dboBuilder.tables) {
|
|
21
|
+
queries.push(...(await (0, getTableTriggerQueries_1.getTableTriggerQueries)(prgl.dbForSchema, table.escaped_identifier, { triggers: config[table.name]?.triggers })));
|
|
22
|
+
}
|
|
23
|
+
if (queries.length) {
|
|
24
|
+
await prgl.dbForSchema.tx((tx) => tx.none(`/* ${PubSubManagerUtils_1.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */\n${queries.join("\n")}`));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
prgl.parsedAuditConfig = previousAudit;
|
|
29
|
+
throw error;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=syncTableTriggers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"syncTableTriggers.js","sourceRoot":"","sources":["../../lib/TableConfig/syncTableTriggers.ts"],"names":[],"mappings":";;AAMA,8CAmCC;AAzCD,gEAA6D;AAE7D,4EAAyF;AACzF,qEAAkE;AAElE,yFAAyF;AAClF,KAAK,UAAU,iBAAiB,CAAC,IAAe;IACrD,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC;IAC7C,MAAM,SAAS,GACb,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,aAAa,CAAC,CAAC,CAAC,MAAM,IAAA,mCAAgB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,IAAI,EAAE,CAAC;QACxD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CACb,6DAA6D,IAAI,EAAE,CACpE,CAAC;YACJ,CAAC;QACH,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAM,IAAA,+CAAsB,EAC9B,IAAI,CAAC,WAAY,EACjB,KAAK,CAAC,kBAAkB,EACxB,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAC3C,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,WAAY,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAChC,EAAE,CAAC,IAAI,CACL,MAAM,uDAAkC,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACrE,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC;QACvC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferDbQueries.d.ts","sourceRoot":"","sources":["../lib/deferDbQueries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE1C,sFAAsF;AACtF,eAAO,MAAM,cAAc,GACzB,IAAI,EAAE,EACN,gBAAgB,MAAM,OAAO,CAAC,IAAI,CAAC,KAClC,EAoBC,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.deferDbQueries = void 0;
|
|
4
|
+
/** Keep the original connection available for schema SQL; defer application calls. */
|
|
5
|
+
const deferDbQueries = (db, getSchemaReady) => new Proxy(db, {
|
|
6
|
+
get(target, key, receiver) {
|
|
7
|
+
const value = Reflect.get(target, key, receiver);
|
|
8
|
+
// Connection metadata and lifecycle methods remain unchanged.
|
|
9
|
+
if (!Object.hasOwn(target, key) ||
|
|
10
|
+
typeof value !== "function" ||
|
|
11
|
+
String(key).startsWith("$"))
|
|
12
|
+
return value;
|
|
13
|
+
return async (...args) => {
|
|
14
|
+
let ready;
|
|
15
|
+
do {
|
|
16
|
+
ready = getSchemaReady();
|
|
17
|
+
await ready;
|
|
18
|
+
} while (ready !== getSchemaReady());
|
|
19
|
+
return Reflect.apply(value, target, args);
|
|
20
|
+
};
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
exports.deferDbQueries = deferDbQueries;
|
|
24
|
+
//# sourceMappingURL=deferDbQueries.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferDbQueries.js","sourceRoot":"","sources":["../lib/deferDbQueries.ts"],"names":[],"mappings":";;;AAEA,sFAAsF;AAC/E,MAAM,cAAc,GAAG,CAC5B,EAAM,EACN,cAAmC,EAC/B,EAAE,CACN,IAAI,KAAK,CAAC,EAAE,EAAE;IACZ,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ;QACvB,MAAM,KAAK,GAAY,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC1D,8DAA8D;QAC9D,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;YAC3B,OAAO,KAAK,KAAK,UAAU;YAC3B,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAE3B,OAAO,KAAK,CAAC;QACf,OAAO,KAAK,EAAE,GAAG,IAAe,EAAE,EAAE;YAClC,IAAI,KAAoB,CAAC;YACzB,GAAG,CAAC;gBACF,KAAK,GAAG,cAAc,EAAE,CAAC;gBACzB,MAAM,KAAK,CAAC;YACd,CAAC,QAAQ,KAAK,KAAK,cAAc,EAAE,EAAE;YACrC,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAY,CAAC;QACvD,CAAC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAvBQ,QAAA,cAAc,kBAuBtB"}
|
package/dist/index.d.ts
CHANGED
|
@@ -14,9 +14,11 @@ export * from "./StorageClient/getLocalStorageClient";
|
|
|
14
14
|
export type { ContextCleanup, CreateContext, CreateContextParams, DB, InitResult, OnReadyParams, } from "./initProstgles";
|
|
15
15
|
export type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
16
16
|
export type * from "./TableConfig/TableConfigTypes";
|
|
17
|
+
export type * from "./Audit/AuditTypes";
|
|
17
18
|
export type * from "./TableHooks/TableHooks";
|
|
18
19
|
export * from "./Auth/utils/upsertNamedExpressMiddleware";
|
|
19
20
|
export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
|
|
20
21
|
export default prostgles;
|
|
21
22
|
export type { FileTableRow } from "./StorageClient/getFileTableConfig";
|
|
23
|
+
export { AUDIT_TABLE_COLUMN_DEFINITIONS, AUDIT_TABLE_COLUMNS, type AuditTableRow } from "./Audit/AuditTable";
|
|
22
24
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAChB,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,EACvC,OAAO,GAAG,SAAS,EAEnB,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAO9B,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CACxD;AAED,qFAAqF;AACrF,eAAO,MAAM,eAAe,GAAI,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,QACvE,OAAO,GAAG,SAAS,EAAE,QAAQ,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,2CAE7E,CAAC;AACF,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACvF,cAAc,uCAAuC,CAAC;AACtD,YAAY,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,EAAE,EACF,UAAU,EACV,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,yBAAyB,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC;AACzB,YAAY,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAChB,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,EACvC,OAAO,GAAG,SAAS,EAEnB,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAO9B,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CACxD;AAED,qFAAqF;AACrF,eAAO,MAAM,eAAe,GAAI,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,QACvE,OAAO,GAAG,SAAS,EAAE,QAAQ,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,2CAE7E,CAAC;AACF,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACvF,cAAc,uCAAuC,CAAC;AACtD,YAAY,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,EAAE,EACF,UAAU,EACV,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,yBAAyB,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC;AACzB,YAAY,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,8BAA8B,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.createProstgles = void 0;
|
|
17
|
+
exports.AUDIT_TABLE_COLUMNS = exports.AUDIT_TABLE_COLUMN_DEFINITIONS = exports.createProstgles = void 0;
|
|
18
18
|
const Prostgles_1 = require("./Prostgles");
|
|
19
19
|
function prostgles(params) {
|
|
20
20
|
const prgl = new Prostgles_1.Prostgles(params);
|
|
@@ -32,4 +32,7 @@ __exportStar(require("./Auth/AuthTypes"), exports);
|
|
|
32
32
|
__exportStar(require("./StorageClient/getLocalStorageClient"), exports);
|
|
33
33
|
__exportStar(require("./Auth/utils/upsertNamedExpressMiddleware"), exports);
|
|
34
34
|
exports.default = prostgles;
|
|
35
|
+
var AuditTable_1 = require("./Audit/AuditTable");
|
|
36
|
+
Object.defineProperty(exports, "AUDIT_TABLE_COLUMN_DEFINITIONS", { enumerable: true, get: function () { return AuditTable_1.AUDIT_TABLE_COLUMN_DEFINITIONS; } });
|
|
37
|
+
Object.defineProperty(exports, "AUDIT_TABLE_COLUMNS", { enumerable: true, get: function () { return AuditTable_1.AUDIT_TABLE_COLUMNS; } });
|
|
35
38
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAKhB,MAA+C;IAE/C,MAAM,IAAI,GAAG,IAAI,qBAAS,CACxB,MAAiE,CAClE,CAAC;IACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0C,EAAE;QAClE,IAAI,EAAE,MAAM;KACb,CAAsD,CAAC;AAC1D,CAAC;AAED,qFAAqF;AAC9E,MAAM,eAAe,GAAG,GAAsD,EAAE;IACrF,OAAO,CAAsB,MAA+C,EAAE,EAAE,CAC9E,SAAS,CAAoB,MAAM,CAAC,CAAC;AACzC,CAAC,CAAC;AAHW,QAAA,eAAe,mBAG1B;AACF,uEAAqD;AACrD,mDAAiC;AAKjC,wEAAsD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAKhB,MAA+C;IAE/C,MAAM,IAAI,GAAG,IAAI,qBAAS,CACxB,MAAiE,CAClE,CAAC;IACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0C,EAAE;QAClE,IAAI,EAAE,MAAM;KACb,CAAsD,CAAC;AAC1D,CAAC;AAED,qFAAqF;AAC9E,MAAM,eAAe,GAAG,GAAsD,EAAE;IACrF,OAAO,CAAsB,MAA+C,EAAE,EAAE,CAC9E,SAAS,CAAoB,MAAM,CAAC,CAAC;AACzC,CAAC,CAAC;AAHW,QAAA,eAAe,mBAG1B;AACF,uEAAqD;AACrD,mDAAiC;AAKjC,wEAAsD;AAatD,4EAA0D;AAE1D,kBAAe,SAAS,CAAC;AAGzB,iDAA6G;AAApG,4HAAA,8BAA8B,OAAA;AAAE,iHAAA,mBAAmB,OAAA"}
|
package/dist/initProstgles.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ string | pg.IConnectionParameters<pg.IClient>;
|
|
|
20
20
|
export type DbConnectionOpts = pg.IDefaults;
|
|
21
21
|
export type PGP = pgPromise.IMain<{}, pg.IClient>;
|
|
22
22
|
export type DB = pgPromise.IDatabase<{}, pg.IClient>;
|
|
23
|
-
export type UpdatableOptions<S = void, SUser extends SessionUser = SessionUser, Context = undefined> = Pick<ProstglesInitOptions<S, SUser, Context>, "io" | "fileTable" | "restApi" | "tableHooks" | "tableConfig" | "schemaFilter" | "auth" | "publish" | "functions" | "publishRawSQL" | "tsGeneratedTypesDir" | "tsGeneratedTypesFunctionsPath" | "modifyClientSchema" | "createContext">;
|
|
23
|
+
export type UpdatableOptions<S = void, SUser extends SessionUser = SessionUser, Context = undefined> = Pick<ProstglesInitOptions<S, SUser, Context>, "io" | "fileTable" | "restApi" | "tableHooks" | "tableConfig" | "audit" | "schemaFilter" | "auth" | "publish" | "functions" | "publishRawSQL" | "tsGeneratedTypesDir" | "tsGeneratedTypesFunctionsPath" | "modifyClientSchema" | "createContext">;
|
|
24
24
|
export type OnInitReason = {
|
|
25
25
|
type: "schema change";
|
|
26
26
|
query: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"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"}
|
package/dist/initProstgles.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initProstgles = void 0;
|
|
4
|
+
const syncTableTriggers_1 = require("./TableConfig/syncTableTriggers");
|
|
5
|
+
const deferDbQueries_1 = require("./deferDbQueries");
|
|
4
6
|
const removeExpressRoute_1 = require("./Auth/utils/removeExpressRoute");
|
|
5
7
|
const DBEventsManager_1 = require("./DBEventsManager");
|
|
6
8
|
const getDbConnection_1 = require("./getDbConnection");
|
|
@@ -73,7 +75,8 @@ const initProstgles = async function (onReady, reason) {
|
|
|
73
75
|
AND app_id != $1
|
|
74
76
|
`, [this.appId])
|
|
75
77
|
.catch(() => { });
|
|
76
|
-
this.
|
|
78
|
+
this.dbForSchema = db;
|
|
79
|
+
this.db = (0, deferDbQueries_1.deferDbQueries)(db, () => this.schemaReady);
|
|
77
80
|
this.pgp = pgp;
|
|
78
81
|
this.isSuperUser = await (0, Prostgles_1.getIsSuperUser)(db);
|
|
79
82
|
}
|
|
@@ -82,18 +85,25 @@ const initProstgles = async function (onReady, reason) {
|
|
|
82
85
|
const pgp = this.pgp;
|
|
83
86
|
try {
|
|
84
87
|
await this.cleanupContext();
|
|
85
|
-
|
|
86
|
-
await (
|
|
87
|
-
|
|
88
|
-
|
|
88
|
+
await this.tableConfigurator?.destroy();
|
|
89
|
+
await this.runSchemaQueries(async () => {
|
|
90
|
+
/* 2. Execute any SQL file if provided */
|
|
91
|
+
await (0, runSQLFile_1.runSQLFile)(this);
|
|
92
|
+
this.preparingTableConfig = true;
|
|
93
|
+
try {
|
|
94
|
+
await this.rebuildDBO();
|
|
95
|
+
await this.initTableConfig(reason);
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
this.preparingTableConfig = false;
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
await this.tableConfigurator?.setTableOnMounts();
|
|
102
|
+
// onMount may create additional targets; validate joins against the completed schema.
|
|
103
|
+
await this.runSchemaQueries(async () => {
|
|
89
104
|
await this.rebuildDBO();
|
|
90
|
-
await
|
|
91
|
-
}
|
|
92
|
-
finally {
|
|
93
|
-
this.preparingTableConfig = false;
|
|
94
|
-
}
|
|
95
|
-
// Validate all configured joins against the completed schema before publishing.
|
|
96
|
-
await this.rebuildDBO();
|
|
105
|
+
await (0, syncTableTriggers_1.syncTableTriggers)(this);
|
|
106
|
+
});
|
|
97
107
|
await this.createContext(reason);
|
|
98
108
|
this.initRestApi();
|
|
99
109
|
this.schemaWatch = await SchemaWatch_1.SchemaWatch.create(this.dboBuilder);
|
|
@@ -121,7 +131,7 @@ const initProstgles = async function (onReady, reason) {
|
|
|
121
131
|
void onReady({
|
|
122
132
|
sql: this.dboBuilder.sql,
|
|
123
133
|
dbo: this.dbo,
|
|
124
|
-
db
|
|
134
|
+
db,
|
|
125
135
|
tables: this.dboBuilder.tables,
|
|
126
136
|
reason,
|
|
127
137
|
context: this.context,
|
|
@@ -175,6 +185,7 @@ const initProstgles = async function (onReady, reason) {
|
|
|
175
185
|
await this.tableConfigurator?.destroy();
|
|
176
186
|
this.dbo = undefined;
|
|
177
187
|
this.db = undefined;
|
|
188
|
+
this.dbForSchema = undefined;
|
|
178
189
|
await db.$pool.end();
|
|
179
190
|
await this.adminClient?.end().catch(() => { });
|
|
180
191
|
this.adminClient = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initProstgles.js","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"initProstgles.js","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateConfiguration.d.ts","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,SAAS,oBAAoB,EAC7B,SAAS,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EACzC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"updateConfiguration.d.ts","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,SAAS,oBAAoB,EAC7B,SAAS,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EACzC,QAAQ,IAAI,kBA+Db,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,+EAOc,CAAC"}
|
|
@@ -15,18 +15,13 @@ const updateConfiguration = async (prgl, onReady, newOpts, force) => {
|
|
|
15
15
|
})
|
|
16
16
|
.filter(prostgles_types_1.isDefined);
|
|
17
17
|
if (!optionsThatChanged.length) {
|
|
18
|
+
await prgl.schemaReady;
|
|
18
19
|
console.warn("No options changed");
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
21
22
|
if ((0, prostgles_types_1.includes)(optionsThatChanged, "restApi")) {
|
|
22
23
|
prgl.initRestApi();
|
|
23
24
|
}
|
|
24
|
-
if ((0, prostgles_types_1.includes)(optionsThatChanged, "tableConfig")) {
|
|
25
|
-
await prgl.initTableConfig({
|
|
26
|
-
type: "prgl.update",
|
|
27
|
-
newOpts,
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
25
|
if ((0, prostgles_types_1.includes)(optionsThatChanged, "schema")) {
|
|
31
26
|
await prgl.refreshDBO();
|
|
32
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateConfiguration.js","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":";;;AAAA,qDAAiF;AAI1E,MAAM,mBAAmB,GAAG,KAAK,EACtC,IAAe,EACf,OAA6B,EAC7B,OAAyC,EACzC,KAAY,EACZ,EAAE;IACF,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,OAAO,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,6DAA6D;QAC7D,IAAI,KAAK,IAAI,CAAC,IAAA,yBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,YAAY;YACZ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO;IACT,CAAC,CAAC;SACD,MAAM,CAAC,2BAAS,CAAC,CAAC;IACrB,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"updateConfiguration.js","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":";;;AAAA,qDAAiF;AAI1E,MAAM,mBAAmB,GAAG,KAAK,EACtC,IAAe,EACf,OAA6B,EAC7B,OAAyC,EACzC,KAAY,EACZ,EAAE;IACF,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,OAAO,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,6DAA6D;QAC7D,IAAI,KAAK,IAAI,CAAC,IAAA,yBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,YAAY;YACZ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO;IACT,CAAC,CAAC;SACD,MAAM,CAAC,2BAAS,CAAC,CAAC;IACrB,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,MAAM,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IACE,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,qBAAqB,CAAC;QACnD,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,+BAA+B,CAAC,EAC7D,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,IAAA,yBAAO,EAAC,OAAO,CAAC;QAAE,OAAO;IAE7B,IACE,kBAAkB,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,EAChG,CAAC;QACD,OAAO;IACT,CAAC;IAED;;;OAGG;IACH,IACE,kBAAkB,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,4BAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,EAChG,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACvB,IAAI,EAAE,aAAa;YACnB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAnEW,QAAA,mBAAmB,uBAmE9B;AAEF;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,IAAI;IACJ,MAAM;IACN,SAAS;IACT,WAAW;IACX,eAAe;IACf,oBAAoB;CACyB,CAAC;AAEhD,MAAM,oBAAoB,GAAG,CAAC,YAAY,CAA+C,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export const AUDIT_TABLE_COLUMN_DEFINITIONS = {
|
|
2
|
+
id: "BIGSERIAL PRIMARY KEY",
|
|
3
|
+
created_at: "TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp()",
|
|
4
|
+
schema_name: "TEXT NOT NULL",
|
|
5
|
+
table_name: "TEXT NOT NULL",
|
|
6
|
+
entity_type: "TEXT NOT NULL",
|
|
7
|
+
operation:
|
|
8
|
+
"TEXT NOT NULL CHECK (operation IN ('INSERT', 'UPDATE', 'DELETE'))",
|
|
9
|
+
old_id: "JSONB",
|
|
10
|
+
new_id: "JSONB",
|
|
11
|
+
old_row: "JSONB",
|
|
12
|
+
new_row: "JSONB",
|
|
13
|
+
actor: "JSONB",
|
|
14
|
+
} as const;
|
|
15
|
+
|
|
16
|
+
export type AuditTableRow = {
|
|
17
|
+
[K in keyof typeof AUDIT_TABLE_COLUMN_DEFINITIONS]: K extends "operation"
|
|
18
|
+
? "INSERT" | "UPDATE" | "DELETE"
|
|
19
|
+
: (typeof AUDIT_TABLE_COLUMN_DEFINITIONS)[K] extends "JSONB"
|
|
20
|
+
? Record<string, unknown> | null
|
|
21
|
+
: string;
|
|
22
|
+
};
|
|
23
|
+
export const AUDIT_TABLE_COLUMNS = Object.keys(
|
|
24
|
+
AUDIT_TABLE_COLUMN_DEFINITIONS,
|
|
25
|
+
) as (keyof AuditTableRow)[];
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export type SchemaConfigTableName<S> = [S] extends [void]
|
|
2
|
+
? string
|
|
3
|
+
: Extract<keyof S, string>;
|
|
4
|
+
export type SchemaConfigColumnName<S, T extends SchemaConfigTableName<S>> = [
|
|
5
|
+
S,
|
|
6
|
+
] extends [void]
|
|
7
|
+
? string
|
|
8
|
+
: T extends keyof S
|
|
9
|
+
? S[T] extends { columns: infer C }
|
|
10
|
+
? Extract<keyof C, string>
|
|
11
|
+
: never
|
|
12
|
+
: never;
|
|
13
|
+
|
|
14
|
+
export type SchemaConfigAuditTableOptions<
|
|
15
|
+
S,
|
|
16
|
+
T extends SchemaConfigTableName<S>,
|
|
17
|
+
> = {
|
|
18
|
+
entityType?: string;
|
|
19
|
+
/** Defaults to all primary-key columns. Required for tables without a primary key. */
|
|
20
|
+
idColumns?: readonly SchemaConfigColumnName<S, T>[];
|
|
21
|
+
excludeColumns?: readonly SchemaConfigColumnName<S, T>[];
|
|
22
|
+
};
|
|
23
|
+
export type SchemaConfigAuditIncludedTables<S> = {
|
|
24
|
+
[T in SchemaConfigTableName<S>]?: 1 | SchemaConfigAuditTableOptions<S, T>;
|
|
25
|
+
};
|
|
26
|
+
export type SchemaConfigAuditExcludedTables<S> = {
|
|
27
|
+
[T in SchemaConfigTableName<S>]?: 0;
|
|
28
|
+
};
|
|
29
|
+
export type SchemaConfigAudit<S = void> = {
|
|
30
|
+
/** Managed append-only table. Uses the same table-name handling as tableConfig. */
|
|
31
|
+
tableName: string;
|
|
32
|
+
/** Omitted/empty means all eligible tables in schemaFilter. Cannot mix enabled and disabled entries. */
|
|
33
|
+
tables?:
|
|
34
|
+
SchemaConfigAuditIncludedTables<S> | SchemaConfigAuditExcludedTables<S>;
|
|
35
|
+
};
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { md5 } from "prostgles-types/dist/md5";
|
|
2
|
+
import type { Prostgles } from "../Prostgles";
|
|
3
|
+
import type {
|
|
4
|
+
TableConfig,
|
|
5
|
+
TableDefinition,
|
|
6
|
+
} from "../TableConfig/TableConfigTypes";
|
|
7
|
+
|
|
8
|
+
import { AUDIT_TABLE_COLUMN_DEFINITIONS } from "./AuditTable";
|
|
9
|
+
import {
|
|
10
|
+
AUDIT_HISTORY_PROTECTION_PREFIX,
|
|
11
|
+
AUDIT_TRUNCATE_PROTECTION_PREFIX,
|
|
12
|
+
AUDIT_WRITER_PREFIX,
|
|
13
|
+
} from "../TableConfig/managedTriggerNames";
|
|
14
|
+
|
|
15
|
+
export type ParsedAuditConfig = {
|
|
16
|
+
/** Includes previously configured history tables, whose protection is retained. */
|
|
17
|
+
auditTableNames: string[];
|
|
18
|
+
tableConfigs: TableConfig;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
export function getAuditProtection(
|
|
22
|
+
tableName: string,
|
|
23
|
+
actions: NonNullable<TableDefinition["triggers"]>[string]["actions"],
|
|
24
|
+
): NonNullable<TableDefinition["triggers"]> {
|
|
25
|
+
return {
|
|
26
|
+
[(actions.includes("update")
|
|
27
|
+
? AUDIT_HISTORY_PROTECTION_PREFIX
|
|
28
|
+
: AUDIT_TRUNCATE_PROTECTION_PREFIX) + md5(tableName)]: {
|
|
29
|
+
type: "before",
|
|
30
|
+
actions,
|
|
31
|
+
forEach: "statement",
|
|
32
|
+
query:
|
|
33
|
+
"BEGIN RAISE EXCEPTION 'Audit protection: % is not allowed on %.%', TG_OP, TG_TABLE_SCHEMA, TG_TABLE_NAME; END;",
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Adds audit definitions to the same config used for file tables and application tables. */
|
|
39
|
+
export function getAuditTableConfig(
|
|
40
|
+
prgl: Prostgles,
|
|
41
|
+
tableConfig: TableConfig | undefined,
|
|
42
|
+
): TableConfig | undefined {
|
|
43
|
+
const { audit } = prgl.opts;
|
|
44
|
+
let result = { ...tableConfig };
|
|
45
|
+
if (audit) {
|
|
46
|
+
const { tableName } = audit;
|
|
47
|
+
if (typeof tableName !== "string" || !tableName)
|
|
48
|
+
throw new Error("audit.tableName is required");
|
|
49
|
+
if (tableConfig?.[tableName]) {
|
|
50
|
+
throw new Error("The audit table cannot also be defined in tableConfig");
|
|
51
|
+
}
|
|
52
|
+
result = {
|
|
53
|
+
[tableName]: {
|
|
54
|
+
columns: AUDIT_TABLE_COLUMN_DEFINITIONS,
|
|
55
|
+
triggers: getAuditProtection(tableName, ["update", "delete", "truncate"]),
|
|
56
|
+
},
|
|
57
|
+
...result,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
for (const [name, config] of Object.entries(
|
|
61
|
+
prgl.parsedAuditConfig?.tableConfigs ?? {},
|
|
62
|
+
)) {
|
|
63
|
+
result[name] = {
|
|
64
|
+
...result[name],
|
|
65
|
+
triggers: { ...result[name]?.triggers, ...config.triggers },
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
return Object.keys(result).length ? result : undefined;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function isAuditTable(prgl: Prostgles, tableName: string): boolean {
|
|
72
|
+
return prgl.parsedAuditConfig?.auditTableNames.includes(tableName) ?? false;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export const getAuditWriterName = (auditTable: string, sourceTable: string) =>
|
|
76
|
+
AUDIT_WRITER_PREFIX + md5(JSON.stringify([auditTable, sourceTable]));
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import { as } from "pg-promise";
|
|
2
|
+
import { asName } from "prostgles-types";
|
|
3
|
+
import type { Prostgles } from "../Prostgles";
|
|
4
|
+
import type { SchemaConfigAuditTableOptions } from "./AuditTypes";
|
|
5
|
+
import {
|
|
6
|
+
getAuditProtection,
|
|
7
|
+
getAuditWriterName,
|
|
8
|
+
type ParsedAuditConfig,
|
|
9
|
+
} from "./getAuditTableConfig";
|
|
10
|
+
|
|
11
|
+
/** Resolve column defaults against the completed schema; generate tableConfig entries only. */
|
|
12
|
+
export async function parseAuditConfig(
|
|
13
|
+
prgl: Prostgles,
|
|
14
|
+
): Promise<ParsedAuditConfig> {
|
|
15
|
+
const { audit } = prgl.opts;
|
|
16
|
+
const tables = prgl.dboBuilder.tables;
|
|
17
|
+
const auditTableNames = [
|
|
18
|
+
...new Set([
|
|
19
|
+
...(prgl.parsedAuditConfig?.auditTableNames ?? []),
|
|
20
|
+
...(audit ? [audit.tableName] : []),
|
|
21
|
+
]),
|
|
22
|
+
];
|
|
23
|
+
const result: ParsedAuditConfig = {
|
|
24
|
+
auditTableNames,
|
|
25
|
+
tableConfigs: {},
|
|
26
|
+
};
|
|
27
|
+
for (const name of auditTableNames) {
|
|
28
|
+
if (!tables.some((t) => t.name === name)) {
|
|
29
|
+
throw new Error(
|
|
30
|
+
`Audit table name must exactly match a schema table name: ${name}`,
|
|
31
|
+
);
|
|
32
|
+
}
|
|
33
|
+
result.tableConfigs[name] = {
|
|
34
|
+
triggers: getAuditProtection(name, ["update", "delete", "truncate"]),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
if (!audit) return result;
|
|
38
|
+
const tableOptions: unknown = audit.tables;
|
|
39
|
+
if (
|
|
40
|
+
tableOptions !== undefined &&
|
|
41
|
+
(!tableOptions ||
|
|
42
|
+
typeof tableOptions !== "object" ||
|
|
43
|
+
Array.isArray(tableOptions))
|
|
44
|
+
) {
|
|
45
|
+
throw new Error("audit.tables must be a table map");
|
|
46
|
+
}
|
|
47
|
+
const entries = Object.entries(audit.tables ?? {}).filter(
|
|
48
|
+
([, value]) => value !== undefined,
|
|
49
|
+
);
|
|
50
|
+
const exclusion = entries.some(([, value]) => value === 0);
|
|
51
|
+
if (exclusion && entries.some(([, value]) => value !== 0))
|
|
52
|
+
throw new Error("audit.tables cannot mix enabled and disabled entries");
|
|
53
|
+
for (const [name, value] of entries) {
|
|
54
|
+
if (!tables.some((t) => t.name === name))
|
|
55
|
+
throw new Error(`Unknown audit table: ${name}`);
|
|
56
|
+
if (
|
|
57
|
+
value !== 0 &&
|
|
58
|
+
value !== 1 &&
|
|
59
|
+
(!value || typeof value !== "object" || Array.isArray(value))
|
|
60
|
+
)
|
|
61
|
+
throw new Error(`Invalid audit options for ${name}`);
|
|
62
|
+
}
|
|
63
|
+
const relations = await prgl.dbForSchema!.any<{
|
|
64
|
+
oid: number;
|
|
65
|
+
relkind: string;
|
|
66
|
+
relispartition: boolean;
|
|
67
|
+
}>(
|
|
68
|
+
"SELECT oid, relkind, relispartition FROM pg_class WHERE oid = ANY($1::oid[])",
|
|
69
|
+
[tables.map((t) => t.oid)],
|
|
70
|
+
);
|
|
71
|
+
for (const table of tables) {
|
|
72
|
+
const entry = entries.find(([name]) => name === table.name);
|
|
73
|
+
if (entries.length && (exclusion ? entry?.[1] === 0 : !entry)) continue;
|
|
74
|
+
const relation = relations.find((r) => r.oid === table.oid);
|
|
75
|
+
const isHistory = auditTableNames.includes(table.name);
|
|
76
|
+
const eligible =
|
|
77
|
+
!isHistory &&
|
|
78
|
+
table.schema !== "prostgles" &&
|
|
79
|
+
!table.is_view &&
|
|
80
|
+
!table.isHyperTable &&
|
|
81
|
+
relation &&
|
|
82
|
+
relation.relkind === "r" &&
|
|
83
|
+
!relation.relispartition;
|
|
84
|
+
if (!eligible) {
|
|
85
|
+
if (entry && entry[1] !== 0)
|
|
86
|
+
throw new Error(
|
|
87
|
+
`Unsupported audit target: ${table.name}. Select ordinary, non-partitioned tables.`,
|
|
88
|
+
);
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
const options: SchemaConfigAuditTableOptions<void, string> =
|
|
92
|
+
typeof entry?.[1] === "object" ? entry[1] : {};
|
|
93
|
+
if (
|
|
94
|
+
Object.keys(options).some(
|
|
95
|
+
(k) => !["entityType", "idColumns", "excludeColumns"].includes(k),
|
|
96
|
+
)
|
|
97
|
+
)
|
|
98
|
+
throw new Error(`Unknown audit option for ${table.name}`);
|
|
99
|
+
const ids =
|
|
100
|
+
options.idColumns ??
|
|
101
|
+
table.columns.filter((c) => c.is_pkey).map((c) => c.name);
|
|
102
|
+
const excluded = options.excludeColumns ?? [];
|
|
103
|
+
if (!Array.isArray(ids) || !ids.length)
|
|
104
|
+
throw new Error(
|
|
105
|
+
`audit.idColumns is required for ${table.name} without a primary key`,
|
|
106
|
+
);
|
|
107
|
+
for (const list of [ids, excluded]) {
|
|
108
|
+
if (
|
|
109
|
+
!Array.isArray(list) ||
|
|
110
|
+
new Set(list).size !== list.length ||
|
|
111
|
+
list.some((c) => !table.columns.some((col) => col.name === c))
|
|
112
|
+
)
|
|
113
|
+
throw new Error(`Invalid audit columns for ${table.name}`);
|
|
114
|
+
}
|
|
115
|
+
if (ids.some((c) => excluded.includes(c)))
|
|
116
|
+
throw new Error(
|
|
117
|
+
`Audit identity columns cannot be excluded: ${table.name}`,
|
|
118
|
+
);
|
|
119
|
+
if (
|
|
120
|
+
options.entityType !== undefined &&
|
|
121
|
+
(typeof options.entityType !== "string" || !options.entityType)
|
|
122
|
+
)
|
|
123
|
+
throw new Error(`Invalid audit entityType for ${table.name}`);
|
|
124
|
+
const functionName = getAuditWriterName(audit.tableName, table.name);
|
|
125
|
+
result.tableConfigs[table.name] = {
|
|
126
|
+
triggers: {
|
|
127
|
+
...getAuditProtection(audit.tableName, ["truncate"]),
|
|
128
|
+
[functionName]: {
|
|
129
|
+
type: "after",
|
|
130
|
+
actions: ["insert", "update", "delete"],
|
|
131
|
+
forEach: "row",
|
|
132
|
+
query: `DECLARE
|
|
133
|
+
before_row jsonb; after_row jsonb; before_id jsonb; after_id jsonb;
|
|
134
|
+
ids text[] := ARRAY[${ids.map((c) => as.text(c)).join(", ")}]::text[];
|
|
135
|
+
excluded text[] := ARRAY[${excluded.map((c) => as.text(c)).join(", ")}]::text[];
|
|
136
|
+
BEGIN
|
|
137
|
+
IF TG_OP <> 'INSERT' THEN
|
|
138
|
+
before_row := to_jsonb(OLD);
|
|
139
|
+
SELECT jsonb_object_agg(k, before_row -> k) INTO before_id FROM unnest(ids) k;
|
|
140
|
+
before_row := before_row - excluded;
|
|
141
|
+
END IF;
|
|
142
|
+
IF TG_OP <> 'DELETE' THEN
|
|
143
|
+
after_row := to_jsonb(NEW);
|
|
144
|
+
SELECT jsonb_object_agg(k, after_row -> k) INTO after_id FROM unnest(ids) k;
|
|
145
|
+
after_row := after_row - excluded;
|
|
146
|
+
END IF;
|
|
147
|
+
IF TG_OP = 'UPDATE' AND before_row IS NOT DISTINCT FROM after_row THEN RETURN NULL; END IF;
|
|
148
|
+
INSERT INTO ${asName(audit.tableName)} (schema_name, table_name, entity_type, operation, old_id, new_id, old_row, new_row, actor)
|
|
149
|
+
VALUES (TG_TABLE_SCHEMA, TG_TABLE_NAME, ${as.text(options.entityType ?? table.name)}, TG_OP, before_id, after_id, before_row, after_row,
|
|
150
|
+
nullif(current_setting('prostgles.user', true), '')::jsonb);
|
|
151
|
+
RETURN NULL;
|
|
152
|
+
END;`,
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
return result;
|
|
158
|
+
}
|