prostgles-server 4.2.553 → 4.2.554
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/dist/DboBuilder/TableHandler/TableHandler.d.ts +11 -3
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js +49 -6
- package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.js +3 -3
- package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
- package/dist/DboBuilder/TableHandler/{executeHooksCheckAndPostValidation.d.ts → executeAfterHooksCheckAndPostValidation.d.ts} +2 -2
- package/dist/DboBuilder/TableHandler/executeAfterHooksCheckAndPostValidation.d.ts.map +1 -0
- package/dist/DboBuilder/TableHandler/{executeHooksCheckAndPostValidation.js → executeAfterHooksCheckAndPostValidation.js} +19 -15
- package/dist/DboBuilder/TableHandler/executeAfterHooksCheckAndPostValidation.js.map +1 -0
- package/dist/DboBuilder/TableHandler/insert/insert.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insert.js +11 -5
- package/dist/DboBuilder/TableHandler/insert/insert.js.map +1 -1
- package/dist/DboBuilder/TableHandler/isApplicableHook.d.ts +5 -0
- package/dist/DboBuilder/TableHandler/isApplicableHook.d.ts.map +1 -0
- package/dist/DboBuilder/TableHandler/isApplicableHook.js +17 -0
- package/dist/DboBuilder/TableHandler/isApplicableHook.js.map +1 -0
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +2 -2
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/update.js +4 -1
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts +28 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts +3 -2
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/TableConfig/getCreateSchemaQueries.d.ts +2 -0
- package/dist/TableConfig/getCreateSchemaQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts +2 -0
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts.map +1 -1
- package/lib/DboBuilder/TableHandler/TableHandler.ts +59 -5
- package/lib/DboBuilder/TableHandler/delete.ts +3 -3
- package/lib/DboBuilder/TableHandler/{executeHooksCheckAndPostValidation.ts → executeAfterHooksCheckAndPostValidation.ts} +25 -16
- package/lib/DboBuilder/TableHandler/insert/insert.ts +21 -7
- package/lib/DboBuilder/TableHandler/isApplicableHook.ts +28 -0
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +2 -2
- package/lib/DboBuilder/TableHandler/update.ts +5 -1
- package/lib/PublishParser/publishTypesAndUtils.ts +31 -1
- package/lib/TableConfig/TableConfig.ts +3 -2
- package/package.json +1 -1
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.d.ts.map +0 -1
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.js.map +0 -1
|
@@ -32,7 +32,12 @@ export declare class TableHandler extends ViewHandler {
|
|
|
32
32
|
};
|
|
33
33
|
joinPaths?: JoinPaths;
|
|
34
34
|
});
|
|
35
|
-
|
|
35
|
+
getBeforeHooks: (command: "update" | "insert", rows: AnyObject[]) => import("../../PublishParser/publishTypesAndUtils").BeforeEachTsTrigger<AnyObject, import("../DboBuilderTypes").DBHandlerServer>[];
|
|
36
|
+
beforeEach: (row: AnyObject, localParams: LocalParams | undefined, command: "insert" | "update") => Promise<{
|
|
37
|
+
row: AnyObject;
|
|
38
|
+
successCallbacks: (() => void)[];
|
|
39
|
+
}>;
|
|
40
|
+
getAfterHooksAndChecks: (command: {
|
|
36
41
|
name: "delete";
|
|
37
42
|
rule: undefined | DeleteRule;
|
|
38
43
|
} | {
|
|
@@ -43,7 +48,7 @@ export declare class TableHandler extends ViewHandler {
|
|
|
43
48
|
rule: undefined | InsertRule;
|
|
44
49
|
}, localParams: LocalParams | undefined) => ({
|
|
45
50
|
readonly commands: Partial<Record<"insert" | "update" | "delete", 1>>;
|
|
46
|
-
readonly changedFields?: string[];
|
|
51
|
+
readonly changedFields?: string[] | undefined;
|
|
47
52
|
readonly validate: (params: import("../../PublishParser/publishTypesAndUtils").ValidateRowArgsCommon<AnyObject, import("../DboBuilderTypes").DBHandlerServer> & {
|
|
48
53
|
localParams: undefined | LocalParams;
|
|
49
54
|
}) => Promise<void>;
|
|
@@ -58,10 +63,12 @@ export declare class TableHandler extends ViewHandler {
|
|
|
58
63
|
} | {
|
|
59
64
|
readonly type: "postValidate";
|
|
60
65
|
readonly validate: import("../../PublishParser/publishTypesAndUtils").PostValidateRowBasic;
|
|
66
|
+
readonly changedFields: undefined;
|
|
61
67
|
readonly checkFilter?: undefined;
|
|
62
68
|
} | {
|
|
63
69
|
readonly type: "checkFilter";
|
|
64
70
|
readonly checkFilter: import("prostgles-types").FullFilter<AnyObject, void>;
|
|
71
|
+
readonly changedFields: undefined;
|
|
65
72
|
readonly validate?: undefined;
|
|
66
73
|
})[];
|
|
67
74
|
shouldWrapInTx: (command: {
|
|
@@ -73,8 +80,9 @@ export declare class TableHandler extends ViewHandler {
|
|
|
73
80
|
} | {
|
|
74
81
|
name: "insert";
|
|
75
82
|
rule: undefined | InsertRule;
|
|
76
|
-
}, localParams: LocalParams | undefined) => {
|
|
83
|
+
}, localParams: LocalParams | undefined, newRows: AnyObject[]) => {
|
|
77
84
|
shouldWrap: boolean;
|
|
85
|
+
hasBeforeHooks: boolean;
|
|
78
86
|
hasAfterChecks: boolean;
|
|
79
87
|
};
|
|
80
88
|
getFinalDbo: (localParams: LocalParams | undefined) => TableHandlers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,WAAW,EACX,YAAY,EAEZ,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,EACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,iBAAiB,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAItD,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"TableHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const insert_1 = require("./insert/insert");
|
|
|
15
15
|
const update_1 = require("./update");
|
|
16
16
|
const updateBatch_1 = require("./updateBatch");
|
|
17
17
|
const upsert_1 = require("./upsert");
|
|
18
|
+
const isApplicableHook_1 = require("./isApplicableHook");
|
|
18
19
|
class TableHandler extends ViewHandler_1.ViewHandler {
|
|
19
20
|
dataValidator;
|
|
20
21
|
constructor({ db, config, dboBuilder, tableOrViewInfo, tx, joinPaths, }) {
|
|
@@ -24,7 +25,40 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
24
25
|
this.dataValidator = new DataValidator_1.DataValidator(this);
|
|
25
26
|
this.is_media = dboBuilder.prostgles.isMedia(this.name);
|
|
26
27
|
}
|
|
27
|
-
|
|
28
|
+
getBeforeHooks = (command, rows) => {
|
|
29
|
+
return (this.config?.hooks?.beforeEach?.filter((hook) => (0, isApplicableHook_1.isApplicableHook)(this, rows, hook, command)) ?? []);
|
|
30
|
+
};
|
|
31
|
+
beforeEach = async (row, localParams, command) => {
|
|
32
|
+
const transaction = this.getTransaction(localParams);
|
|
33
|
+
const hooks = this.getBeforeHooks(command, [row]);
|
|
34
|
+
let newRow = row;
|
|
35
|
+
const successCallbacks = [];
|
|
36
|
+
for (const hook of hooks) {
|
|
37
|
+
const isApplicable = (0, isApplicableHook_1.isApplicableHook)(this, [newRow], hook, command);
|
|
38
|
+
if (!isApplicable)
|
|
39
|
+
continue;
|
|
40
|
+
const hookResult = await hook.validate({
|
|
41
|
+
row: newRow,
|
|
42
|
+
command: "insert",
|
|
43
|
+
data: newRow,
|
|
44
|
+
dbx: this.getFinalDbo(localParams),
|
|
45
|
+
localParams,
|
|
46
|
+
tx: transaction?.t || this.db,
|
|
47
|
+
});
|
|
48
|
+
if (hookResult) {
|
|
49
|
+
newRow = hookResult.row;
|
|
50
|
+
const { onInserted } = hookResult;
|
|
51
|
+
if (onInserted) {
|
|
52
|
+
successCallbacks.push(onInserted);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return {
|
|
57
|
+
row: newRow,
|
|
58
|
+
successCallbacks,
|
|
59
|
+
};
|
|
60
|
+
};
|
|
61
|
+
getAfterHooksAndChecks = (command, localParams) => {
|
|
28
62
|
const { postValidate, checkFilter } = command.name === "delete" ? {} : (command.rule ?? {});
|
|
29
63
|
if (postValidate && !localParams) {
|
|
30
64
|
throw new Error("Unexpected: no localParams for postValidate");
|
|
@@ -55,15 +89,24 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
55
89
|
.filter(prostgles_types_1.isDefined);
|
|
56
90
|
return [
|
|
57
91
|
...(afterEachHooks ?? []),
|
|
58
|
-
...(postValidate ?
|
|
59
|
-
|
|
92
|
+
...(postValidate ?
|
|
93
|
+
[{ type: "postValidate", validate: postValidate, changedFields: undefined }]
|
|
94
|
+
: []),
|
|
95
|
+
...(checkFilter ?
|
|
96
|
+
[{ type: "checkFilter", checkFilter, changedFields: undefined }]
|
|
97
|
+
: []),
|
|
60
98
|
...(afterAllHooks ?? []),
|
|
61
99
|
];
|
|
62
100
|
};
|
|
63
|
-
shouldWrapInTx = (command, localParams) => {
|
|
101
|
+
shouldWrapInTx = (command, localParams, newRows) => {
|
|
64
102
|
const transaction = this.getTransaction(localParams);
|
|
65
|
-
const hasAfterChecks = this.
|
|
66
|
-
|
|
103
|
+
const hasAfterChecks = this.getAfterHooksAndChecks(command, localParams).length > 0;
|
|
104
|
+
const hasBeforeHooks = command.name !== "delete" && this.getBeforeHooks(command.name, newRows).length > 0;
|
|
105
|
+
return {
|
|
106
|
+
shouldWrap: !transaction && (hasAfterChecks || hasBeforeHooks),
|
|
107
|
+
hasBeforeHooks,
|
|
108
|
+
hasAfterChecks,
|
|
109
|
+
};
|
|
67
110
|
};
|
|
68
111
|
getFinalDbo = (localParams) => {
|
|
69
112
|
return this.getTransaction(localParams)?.dbTX ?? this.dboBuilder.dbo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":";;;AAUA,qDAAoD;AAQpD,iGAA8F;AAI9F,8CAAsF;AAEtF,0DAAuD;AACvD,+EAA4E;AAC5E,mEAAgE;AAChE,+DAA2F;AAE3F,4DAAyD;AACzD,mDAAgD;AAChD,qCAAmC;AACnC,4CAAyC;AACzC,qCAAkC;AAClC,+CAA4C;AAC5C,qCAAkC;
|
|
1
|
+
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
6
|
const onDeleteFromFileTable_1 = require("./onDeleteFromFileTable");
|
|
7
7
|
const getReturnTypeQuery_1 = require("../ViewHandler/getReturnTypeQuery");
|
|
8
|
-
const
|
|
8
|
+
const executeAfterHooksCheckAndPostValidation_1 = require("./executeAfterHooksCheckAndPostValidation");
|
|
9
9
|
async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
10
10
|
const start = Date.now();
|
|
11
11
|
try {
|
|
@@ -13,7 +13,7 @@ async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
|
13
13
|
filter = filter || {};
|
|
14
14
|
this.checkFilter(filter);
|
|
15
15
|
const operation = { name: "delete", rule: tableRules?.delete };
|
|
16
|
-
const { hasAfterChecks, shouldWrap } = this.shouldWrapInTx(operation, localParams);
|
|
16
|
+
const { hasAfterChecks, shouldWrap } = this.shouldWrapInTx(operation, localParams, []);
|
|
17
17
|
if (shouldWrap) {
|
|
18
18
|
return this.dboBuilder.getTX((t) => t[this.name]?.delete?.(filter, params, param3_unused, tableRules, localParams));
|
|
19
19
|
}
|
|
@@ -138,7 +138,7 @@ async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
|
138
138
|
throw "Missing full row for after checks";
|
|
139
139
|
return fullRow;
|
|
140
140
|
});
|
|
141
|
-
await (0,
|
|
141
|
+
await (0, executeAfterHooksCheckAndPostValidation_1.executeAfterHooksCheckAndPostValidation)({
|
|
142
142
|
tableHandler: this,
|
|
143
143
|
operation,
|
|
144
144
|
localParams,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":";;AAeA,0BA6MC;AA3ND,qDAAgG;AAGhG,8CAKuB;AAEvB,mEAAgE;AAChE,0EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":";;AAeA,0BA6MC;AA3ND,qDAAgG;AAGhG,8CAKuB;AAEvB,mEAAgE;AAChE,0EAAuE;AACvE,uGAAoG;AAE7F,KAAK,UAAU,OAAO,CAE3B,MAAe,EACf,MAAqB,EACrB,aAAyB,EACzB,UAA4B,EAC5B,WAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEzB,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAW,CAAC;QACxE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QACvF,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAChC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAsC,EAAE,MAAM,EAAE,CAC1D,MAAM,EACN,MAAM,EACN,aAAa,EACb,UAAU,EACV,WAAW,CACZ,CACF,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,GAA0B,EAAE,EAC1C,YAAY,GAA4B,GAAG,EAC3C,eAAe,GAA4B,GAAG,EAC9C,QAAgC,CAAC;QAEnC,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QAC/C,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,MAAM;gBAAE,MAAM,sBAAsB,CAAC;YACrD,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC;YACpD,6DAA6D;YAC7D,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEtC,IAAI,CAAC,eAAe;gBAAE,eAAe,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC;YAClE,IAAI,CAAC,eAAe;gBAAE,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;YAEvE,IAAI,CAAC,YAAY;gBAAE,MAAM,4BAA4B,IAAI,CAAC,IAAI,yBAAyB,CAAC;YAExF,+BAA+B;YAC/B,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,CAAC,iBAAiB,CAAC;oBAC3B,YAAY;oBACZ,eAAe;oBACf,YAAY;oBACZ,IAAI,EAAE,QAAQ;iBACf,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,cAAc,GAAkC;gBACpD,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,CAAC;aACd,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,UAAU,CAAC,MAAM;gBACnB,MAAM,CACJ,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CACxF,CAAC;QACN,CAAC;QAED,IAAI,SAAS,GAA8B,MAAM,CAAC;QAClD,IAAI,eAAe,GAAG,eAAe,IAAI,CAAC,WAAW,GAAG,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACzC,MAAM,EAAE,SAAS;YACjB,MAAM;YACN,YAAY;YACZ,YAAY;YACZ,WAAW;YACX,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;QACH,eAAe,IAAI,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEpC,MAAM,YAAY,GAAG,qBAA8B,CAAC;QACpD,MAAM,gBAAgB,GACpB,cAAc,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,WAAW,QAAQ,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAS,GAAG,KAAK,CAAC;YAClB,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,sBAAsB,CAAC;YAC/B,CAAC;YACD,cAAc,GAAG,IAAI,CAAC,eAAe,CACnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAC/E,CAAC;YACF,IAAI,cAAc,EAAE,CAAC;gBACnB,cAAc,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC5C,CAAC;YACD,eAAe,IAAI,cAAc,CAAC;QACpC,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,eAAe,IAAI,cAAc,gBAAgB,EAAE,CAAC;QACtD,CAAC;QAED,+BAA+B;QAC/B,iGAAiG;QACjG,yCAAyC;QACzC,+BAA+B;QAC/B,kIAAkI;QAClI,MAAM;QACN,IAAI;QAEJ,MAAM,YAAY,GAAG,IAAA,wBAAW,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAE/D,MAAM,aAAa,GAAG,MAAM,IAAA,uCAAkB,EAAC;YAC7C,OAAO,EAAE,IAAI;YACb,WAAW;YACX,eAAe;YACf,YAAY;YACZ,UAAU,EAAE,MAAM,EAAE,UAAU;YAC9B,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAA0B,CAAC;QACpC,CAAC;QAED;;WAEG;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,MAAM,6CAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpD,WAAW;gBACX,SAAS;gBACT,cAAc,EAAE,SAAS;gBACzB,UAAU;aACX,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC;gBACd,OAAO,EAAE,QAAQ;gBACjB,WAAW;gBACX,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;aAC7B,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;QAEjE,MAAM,WAAW,GAAG,IAAA,0BAAQ,EAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACnE,MAAM,YAAY,GAChB,WAAW,CAAC,CAAC;YACX,SAAS,CAAC,SAAS,CAAY,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnF,CAAC,CAAC,SAAS,CAAC,GAAG,CAAY,YAAY,CAAC,CAAC;QAE3C,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACnD,IAAA,oCAAuB,EAAC,GAAG,EAAE;YAC3B,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CACH,CAAC;QAEF,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAG,CAAC,CAAC,YAAY,CAA0B,CAAC;gBACzD,IAAI,CAAC,OAAO;oBAAE,MAAM,mCAAmC,CAAC;gBACxD,OAAO,OAAO,CAAC;YACjB,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,iFAAuC,EAAC;gBAC5C,YAAY,EAAE,IAAI;gBAClB,SAAS;gBACT,WAAW;gBACX,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;QACL,CAAC;QAED,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CACxC,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,EAAE,EAAE,EAAE,CAAC,cAAc,CAC7D,CAAC;QAEF,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,QAAQ;YACjB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC7B,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAClE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,QAAQ;YACjB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC5B,KAAK,EAAE,IAAA,6BAAgB,EAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,IAAA,gDAAmC,EAAC,CAAC,EAAE;YAC3C,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { AnyObject } from "prostgles-types";
|
|
|
2
2
|
import type { DeleteRule, InsertRule, UpdateRule } from "../../PublishParser/PublishParser";
|
|
3
3
|
import type { LocalParams } from "../DboBuilder";
|
|
4
4
|
import type { TableHandler } from "./TableHandler";
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const executeAfterHooksCheckAndPostValidation: ({ tableHandler, operation, data, localParams, rows, }: {
|
|
6
6
|
tableHandler: TableHandler;
|
|
7
7
|
operation: {
|
|
8
8
|
name: "delete";
|
|
@@ -18,4 +18,4 @@ export declare const executeHooksCheckAndPostValidation: ({ tableHandler, operat
|
|
|
18
18
|
data: AnyObject | AnyObject[];
|
|
19
19
|
rows: AnyObject[];
|
|
20
20
|
}) => Promise<void>;
|
|
21
|
-
//# sourceMappingURL=
|
|
21
|
+
//# sourceMappingURL=executeAfterHooksCheckAndPostValidation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executeAfterHooksCheckAndPostValidation.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/executeAfterHooksCheckAndPostValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE5F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,eAAO,MAAM,uCAAuC,GAAU,uDAM3D;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EACL;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAA;KAAE,GAChD;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAA;KAAE,GAChD;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAA;KAAE,CAAC;IACrD,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC9B,IAAI,EAAE,SAAS,EAAE,CAAC;CACnB,kBA0EA,CAAC"}
|
|
@@ -1,24 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.executeAfterHooksCheckAndPostValidation = void 0;
|
|
4
4
|
const utils_1 = require("../../utils/utils");
|
|
5
|
-
const
|
|
5
|
+
const isApplicableHook_1 = require("./isApplicableHook");
|
|
6
|
+
const executeAfterHooksCheckAndPostValidation = async ({ tableHandler, operation, data, localParams, rows, }) => {
|
|
6
7
|
const command = operation.name;
|
|
7
8
|
const transaction = tableHandler.getTransaction(localParams);
|
|
8
|
-
const hooks = tableHandler.
|
|
9
|
-
|
|
10
|
-
const getChangedFieldsSet = () => {
|
|
11
|
-
changedFieldsSet ??= new Set(((0, utils_1.isArray)(data) ? data : [data]).map((row) => Object.keys(row)).flat());
|
|
12
|
-
return changedFieldsSet;
|
|
13
|
-
};
|
|
9
|
+
const hooks = tableHandler.getAfterHooksAndChecks(operation, localParams);
|
|
10
|
+
const newRows = (0, utils_1.isArray)(data) ? data : [data];
|
|
14
11
|
const applicableHooks = hooks.filter((hook) => {
|
|
15
12
|
if (hook.type === "checkFilter")
|
|
16
13
|
return false;
|
|
17
14
|
if (hook.type === "postValidate")
|
|
18
15
|
return true;
|
|
19
|
-
|
|
20
|
-
return (commands[command] &&
|
|
21
|
-
(!changedFields || changedFields.some((f) => getChangedFieldsSet().has(f))));
|
|
16
|
+
return (0, isApplicableHook_1.isApplicableHook)(tableHandler, newRows, hook, command);
|
|
22
17
|
});
|
|
23
18
|
if (applicableHooks.length) {
|
|
24
19
|
if (!transaction) {
|
|
@@ -36,6 +31,9 @@ const executeHooksCheckAndPostValidation = async ({ tableHandler, operation, dat
|
|
|
36
31
|
data,
|
|
37
32
|
};
|
|
38
33
|
for (const hook of applicableHooks) {
|
|
34
|
+
const isApplicable = (0, isApplicableHook_1.isApplicableHook)(tableHandler, [row], { commands: { [command]: 1 }, changedFields: hook.changedFields }, command);
|
|
35
|
+
if (!isApplicable)
|
|
36
|
+
continue;
|
|
39
37
|
if (hook.type === "afterEach") {
|
|
40
38
|
await hook.validate({
|
|
41
39
|
...commonParams,
|
|
@@ -53,17 +51,23 @@ const executeHooksCheckAndPostValidation = async ({ tableHandler, operation, dat
|
|
|
53
51
|
}
|
|
54
52
|
}
|
|
55
53
|
for (const hook of applicableHooks) {
|
|
54
|
+
const applicableRows = newRows.filter((row) => {
|
|
55
|
+
const isApplicable = (0, isApplicableHook_1.isApplicableHook)(tableHandler, [row], { commands: { [command]: 1 }, changedFields: hook.changedFields }, command);
|
|
56
|
+
return isApplicable;
|
|
57
|
+
});
|
|
58
|
+
if (!applicableRows.length)
|
|
59
|
+
continue;
|
|
56
60
|
if (hook.type === "afterAll") {
|
|
57
61
|
await hook.validate({
|
|
58
62
|
...txParams,
|
|
59
63
|
command,
|
|
60
|
-
data:
|
|
61
|
-
rows,
|
|
64
|
+
data: newRows,
|
|
65
|
+
rows: applicableRows,
|
|
62
66
|
localParams,
|
|
63
67
|
});
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
}
|
|
67
71
|
};
|
|
68
|
-
exports.
|
|
69
|
-
//# sourceMappingURL=
|
|
72
|
+
exports.executeAfterHooksCheckAndPostValidation = executeAfterHooksCheckAndPostValidation;
|
|
73
|
+
//# sourceMappingURL=executeAfterHooksCheckAndPostValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executeAfterHooksCheckAndPostValidation.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/executeAfterHooksCheckAndPostValidation.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAG5C,yDAAsD;AAE/C,MAAM,uCAAuC,GAAG,KAAK,EAAE,EAC5D,YAAY,EACZ,SAAS,EACT,IAAI,EACJ,WAAW,EACX,IAAI,GAUL,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;IAC/B,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,YAAY,CAAC,sBAAsB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE9C,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,KAAK,CAAC;QAC9C,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;YAAE,OAAO,IAAI,CAAC;QAC9C,OAAO,IAAA,mCAAgB,EAAC,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,QAAQ,GAAG;YACf,EAAE,EAAE,WAAW,CAAC,CAAC;YACjB,GAAG,EAAE,WAAW,CAAC,IAAI;SACtB,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG;gBACnB,GAAG,EAAE,GAAG;gBACR,GAAG,QAAQ;gBACX,OAAO;gBACP,IAAI;aACI,CAAC;YACX,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;gBACnC,MAAM,YAAY,GAAG,IAAA,mCAAgB,EACnC,YAAY,EACZ,CAAC,GAAG,CAAC,EACL,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,EACjE,OAAO,CACR,CAAC;gBACF,IAAI,CAAC,YAAY;oBAAE,SAAS;gBAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC9B,MAAM,IAAI,CAAC,QAAQ,CAAC;wBAClB,GAAG,YAAY;wBACf,WAAW;qBACZ,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBACxC,IAAI,CAAC,WAAW;wBAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;oBACjF,MAAM,IAAI,CAAC,QAAQ,CAAC;wBAClB,GAAG,YAAY;wBACf,WAAW;qBACZ,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;YACnC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5C,MAAM,YAAY,GAAG,IAAA,mCAAgB,EACnC,YAAY,EACZ,CAAC,GAAG,CAAC,EACL,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,EACjE,OAAO,CACR,CAAC;gBACF,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,CAAC,MAAM;gBAAE,SAAS;YACrC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC;oBAClB,GAAG,QAAQ;oBACX,OAAO;oBACP,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,cAAc;oBACpB,WAAW;iBACZ,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAzFW,QAAA,uCAAuC,2CAyFlD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insert.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/D,OAAO,KAAK,EAAE,eAAe,EAAoB,MAAM,sCAAsC,CAAC;AAC9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insert.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/D,OAAO,KAAK,EAAE,eAAe,EAAoB,MAAM,sCAAsC,CAAC;AAC9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAOpD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE,SAAS,GAAG,SAAS,EAAO,EACvC,YAAY,CAAC,EAAE,YAAY,EAC3B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,CAqRd"}
|
|
@@ -8,6 +8,7 @@ const insertTest_1 = require("../insertTest");
|
|
|
8
8
|
const runInsertUpdateQuery_1 = require("../runInsertUpdateQuery");
|
|
9
9
|
const insertNestedRecords_1 = require("./insertNestedRecords");
|
|
10
10
|
const getReturnTypeQuery_1 = require("../../ViewHandler/getReturnTypeQuery");
|
|
11
|
+
const utils_1 = require("../../../utils/utils");
|
|
11
12
|
async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, localParams) {
|
|
12
13
|
const ACTION = "insert";
|
|
13
14
|
const start = Date.now();
|
|
@@ -18,7 +19,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
18
19
|
const { validate, allowedNestedInserts, requiredNestedInserts } = rule ?? {};
|
|
19
20
|
const finalDBtx = this.getTransaction(localParams);
|
|
20
21
|
/** Post validate and checkFilter require a transaction dbo handler because they need the action result */
|
|
21
|
-
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams).shouldWrap) {
|
|
22
|
+
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams, (0, utils_1.isArray)(rowOrRows) ? rowOrRows : [rowOrRows]).shouldWrap) {
|
|
22
23
|
return this.dboBuilder.getTX((t) => t[this.name]?.[ACTION](rowOrRows, insertParams, param3_unused, tableRules, localParams));
|
|
23
24
|
}
|
|
24
25
|
const { testOnly, fields, forcedData, returningFields } = await insertTest_1.insertTest.bind(this)({
|
|
@@ -34,7 +35,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
34
35
|
throw `Direct inserts not allowed. Only nested inserts from these tables: ${JSON.stringify(allowedNestedInserts)} `;
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
|
-
const isMultiInsert =
|
|
38
|
+
const isMultiInsert = (0, utils_1.isArray)(rowOrRows);
|
|
38
39
|
const rows = isMultiInsert ? rowOrRows : [rowOrRows];
|
|
39
40
|
requiredNestedInserts?.forEach(({ ftable, maxRows, minRows }) => {
|
|
40
41
|
if (this.column_names.includes(ftable))
|
|
@@ -42,7 +43,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
42
43
|
rows.forEach((row, rowId) => {
|
|
43
44
|
const nestedInsert = row[ftable];
|
|
44
45
|
const nestedInsertRows = (0, prostgles_types_1.isObject)(nestedInsert) ? [nestedInsert]
|
|
45
|
-
:
|
|
46
|
+
: (0, utils_1.isArray)(nestedInsert) ? nestedInsert
|
|
46
47
|
: [];
|
|
47
48
|
if (!nestedInsertRows.length) {
|
|
48
49
|
throw `Missing required nested insert on rowId ${rowId} for ftable: ${ftable}`;
|
|
@@ -56,14 +57,15 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
56
57
|
});
|
|
57
58
|
});
|
|
58
59
|
validateInsertParams(insertParams);
|
|
59
|
-
// const tx = localParams?.tx?.t || this.tx?.t;
|
|
60
60
|
const transaction = this.getTransaction(localParams);
|
|
61
61
|
const tx = transaction?.t || this.db;
|
|
62
|
+
const successCallbacks = [];
|
|
62
63
|
const preValidatedRows = await Promise.all(rows.map(async (nonValidated) => {
|
|
63
64
|
const { preValidate, validate } = rule ?? {};
|
|
64
65
|
const { tableConfigurator } = this.dboBuilder.prostgles;
|
|
65
|
-
if (!tableConfigurator)
|
|
66
|
+
if (!tableConfigurator) {
|
|
66
67
|
throw "tableConfigurator missing";
|
|
68
|
+
}
|
|
67
69
|
let row = await tableConfigurator.getPreInsertRow(this, {
|
|
68
70
|
dbx: this.getFinalDbo(localParams),
|
|
69
71
|
validate,
|
|
@@ -73,6 +75,9 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
73
75
|
command: "insert",
|
|
74
76
|
data: nonValidated,
|
|
75
77
|
});
|
|
78
|
+
const beforeResult = await this.beforeEach(row, localParams, "insert");
|
|
79
|
+
row = beforeResult.row;
|
|
80
|
+
beforeResult.successCallbacks.forEach((cb) => successCallbacks.push(cb));
|
|
76
81
|
if (preValidate) {
|
|
77
82
|
if (!localParams) {
|
|
78
83
|
throw "localParams missing for insert preValidate";
|
|
@@ -217,6 +222,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
217
222
|
data: { rowOrRows, param2: insertParams },
|
|
218
223
|
duration: Date.now() - start,
|
|
219
224
|
});
|
|
225
|
+
successCallbacks.forEach((cb) => cb());
|
|
220
226
|
return result;
|
|
221
227
|
}
|
|
222
228
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insert.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insert.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { AnyObject } from "prostgles-types";
|
|
2
|
+
import type { AfterEachTsTrigger } from "../../PublishParser/PublishParser";
|
|
3
|
+
import type { TableHandler } from "./TableHandler";
|
|
4
|
+
export declare const isApplicableHook: (tableHandler: TableHandler, rows: AnyObject[], hook: Pick<AfterEachTsTrigger<AnyObject, any>, "commands" | "changedFields">, command: "insert" | "update" | "delete") => boolean;
|
|
5
|
+
//# sourceMappingURL=isApplicableHook.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isApplicableHook.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/isApplicableHook.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,gBAAgB,GAC3B,cAAc,YAAY,EAC1B,MAAM,SAAS,EAAE,EACjB,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,eAAe,CAAC,EAC5E,SAAS,QAAQ,GAAG,QAAQ,GAAG,QAAQ,YAmBxC,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isApplicableHook = void 0;
|
|
4
|
+
const isApplicableHook = (tableHandler, rows, hook, command) => {
|
|
5
|
+
let changedFieldsSet = undefined;
|
|
6
|
+
const getChangedFieldsSet = () => {
|
|
7
|
+
changedFieldsSet ??= new Set(tableHandler.column_names.filter((col) => rows.some((row) => row[col] !== undefined && row[col] !== null)));
|
|
8
|
+
return changedFieldsSet;
|
|
9
|
+
};
|
|
10
|
+
const { commands, changedFields } = hook;
|
|
11
|
+
return Boolean(commands[command] &&
|
|
12
|
+
(command === "delete" ||
|
|
13
|
+
!changedFields ||
|
|
14
|
+
changedFields.some((f) => getChangedFieldsSet().has(f))));
|
|
15
|
+
};
|
|
16
|
+
exports.isApplicableHook = isApplicableHook;
|
|
17
|
+
//# sourceMappingURL=isApplicableHook.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isApplicableHook.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/isApplicableHook.ts"],"names":[],"mappings":";;;AAIO,MAAM,gBAAgB,GAAG,CAC9B,YAA0B,EAC1B,IAAiB,EACjB,IAA4E,EAC5E,OAAuC,EACvC,EAAE;IACF,IAAI,gBAAgB,GAAG,SAAoC,CAAC;IAC5D,MAAM,mBAAmB,GAAG,GAAG,EAAE;QAC/B,gBAAgB,KAAK,IAAI,GAAG,CAC1B,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACvC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAChE,CACF,CAAC;QACF,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;IAEF,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IACzC,OAAO,OAAO,CACZ,QAAQ,CAAC,OAAO,CAAC;QACjB,CAAC,OAAO,KAAK,QAAQ;YACnB,CAAC,aAAa;YACd,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B"}
|
|
@@ -4,7 +4,7 @@ exports.runInsertUpdateQuery = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
6
|
const TableHandler_1 = require("./TableHandler");
|
|
7
|
-
const
|
|
7
|
+
const executeAfterHooksCheckAndPostValidation_1 = require("./executeAfterHooksCheckAndPostValidation");
|
|
8
8
|
const runInsertUpdateQuery = async (args) => {
|
|
9
9
|
const { tableHandler, queryWithoutUserRLS, rule, localParams, fields, returningFields, params, nestedInsertsResultsObj, data, command, } = args;
|
|
10
10
|
const { name } = tableHandler;
|
|
@@ -69,7 +69,7 @@ const runInsertUpdateQuery = async (args) => {
|
|
|
69
69
|
throw new Error(`Insert ${name} records failed the check condition: ${JSON.stringify(checkFilter, null, 2)}`);
|
|
70
70
|
}
|
|
71
71
|
const rows = result.modified ?? [];
|
|
72
|
-
await (0,
|
|
72
|
+
await (0, executeAfterHooksCheckAndPostValidation_1.executeAfterHooksCheckAndPostValidation)({
|
|
73
73
|
tableHandler,
|
|
74
74
|
operation: command === "insert" ? { name: "insert", rule } : { name: "update", rule },
|
|
75
75
|
localParams,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":";;;AACA,qDAAyC;AAGzC,8CAAqE;AAErE,iDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAKnD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAKnD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAgN3B"}
|
|
@@ -15,7 +15,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
15
15
|
const transaction = this.getTransaction(localParams);
|
|
16
16
|
const wrapInTx = () => this.dboBuilder.getTX((th) => th[this.name]?.[ACTION]?.(filter, _newData, params, tableRules, localParams));
|
|
17
17
|
const rule = tableRules?.[ACTION];
|
|
18
|
-
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams).shouldWrap) {
|
|
18
|
+
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams, [_newData]).shouldWrap) {
|
|
19
19
|
return wrapInTx();
|
|
20
20
|
}
|
|
21
21
|
let newData = _newData;
|
|
@@ -49,6 +49,8 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
49
49
|
if (bad_params.length)
|
|
50
50
|
throw ("Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", "));
|
|
51
51
|
}
|
|
52
|
+
const beforeResult = await this.beforeEach(newData, localParams, "update");
|
|
53
|
+
newData = beforeResult.row;
|
|
52
54
|
const { data, allowedCols } = (0, DataValidator_1.prepareNewData)({
|
|
53
55
|
row: newData,
|
|
54
56
|
forcedData,
|
|
@@ -149,6 +151,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
149
151
|
data: { filter, _newData, params },
|
|
150
152
|
duration: Date.now() - start,
|
|
151
153
|
});
|
|
154
|
+
beforeResult.successCallbacks.forEach((cb) => cb());
|
|
152
155
|
return result;
|
|
153
156
|
}
|
|
154
157
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
|