prostgles-server 4.2.485 → 4.2.486

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.
Files changed (25) hide show
  1. package/dist/DboBuilder/TableHandler/insert/getInsertTableRules.d.ts +5 -0
  2. package/dist/DboBuilder/TableHandler/insert/getInsertTableRules.d.ts.map +1 -0
  3. package/dist/DboBuilder/TableHandler/insert/getInsertTableRules.js +16 -0
  4. package/dist/DboBuilder/TableHandler/insert/getInsertTableRules.js.map +1 -0
  5. package/dist/DboBuilder/TableHandler/insert/getReferenceColumnInserts.d.ts +18 -0
  6. package/dist/DboBuilder/TableHandler/insert/getReferenceColumnInserts.d.ts.map +1 -0
  7. package/dist/DboBuilder/TableHandler/insert/getReferenceColumnInserts.js +45 -0
  8. package/dist/DboBuilder/TableHandler/insert/getReferenceColumnInserts.js.map +1 -0
  9. package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts +0 -18
  10. package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts.map +1 -1
  11. package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js +33 -251
  12. package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js.map +1 -1
  13. package/dist/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.d.ts +23 -0
  14. package/dist/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.d.ts.map +1 -0
  15. package/dist/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.js +190 -0
  16. package/dist/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.js.map +1 -0
  17. package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
  18. package/dist/DboBuilder/TableHandler/update.js +4 -3
  19. package/dist/DboBuilder/TableHandler/update.js.map +1 -1
  20. package/lib/DboBuilder/TableHandler/insert/getInsertTableRules.ts +23 -0
  21. package/lib/DboBuilder/TableHandler/insert/getReferenceColumnInserts.ts +64 -0
  22. package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts +39 -396
  23. package/lib/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.ts +311 -0
  24. package/lib/DboBuilder/TableHandler/update.ts +2 -1
  25. package/package.json +9 -9
@@ -0,0 +1,190 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.insertRowWithNestedRecords = insertRowWithNestedRecords;
4
+ const prostgles_types_1 = require("prostgles-types");
5
+ const getInsertTableRules_1 = require("./getInsertTableRules");
6
+ /**
7
+ * Referenced inserts within a single transaction
8
+ */
9
+ async function insertRowWithNestedRecords({ row, extraKeys, colInserts, dbTX, rootOnConflict, }, { insertParams, tableRules, localParams }) {
10
+ /* Ensure we're using the same transaction */
11
+ const tableHandler = this.tx ? this : dbTX[this.name];
12
+ const omitedKeys = extraKeys.concat(colInserts.map((c) => c.insertedFieldName));
13
+ const rootData = (0, prostgles_types_1.omitKeys)(row, omitedKeys);
14
+ let insertedChildren;
15
+ let targetTableRules;
16
+ const colInsertsResult = colInserts.map((ci) => ({
17
+ ...ci,
18
+ inserted: undefined,
19
+ }));
20
+ /** Insert referenced first and then populate root data with referenced keys */
21
+ for (const colInsert of colInsertsResult) {
22
+ const newLocalParams = {
23
+ ...localParams,
24
+ nestedInsert: {
25
+ depth: (localParams?.nestedInsert?.depth ?? 0) + 1,
26
+ previousData: rootData,
27
+ previousTable: this.name,
28
+ referencingColumn: colInsert.insertedFieldName,
29
+ },
30
+ };
31
+ const colRows = await referencedInsert(tableHandler, dbTX, newLocalParams, colInsert.tableName, row[colInsert.insertedFieldName], rootOnConflict);
32
+ const [colRow, ...otherColRows] = colRows;
33
+ if (!Array.isArray(colRows) || !colRow || otherColRows.length) {
34
+ const someFcolsAreNullOrUndefined = colRow && colInsert.insertedFieldRef.fcols.some((fcol) => colRow[fcol] === undefined);
35
+ throw new Error([
36
+ "Could not do nested column insert: ",
37
+ someFcolsAreNullOrUndefined ?
38
+ "Some fcols values are undefined"
39
+ : "Unexpected return " + JSON.stringify(colRows),
40
+ ].join("\n"));
41
+ }
42
+ colInsert.inserted = colRows;
43
+ colInsert.insertedFieldRef.fcols.map((fcol, idx) => {
44
+ const col = colInsert.insertedFieldRef.cols[idx];
45
+ if (!col)
46
+ throw "Invalid column name for colInsert.insertedFieldRef.cols";
47
+ const foreignKey = colRow[fcol];
48
+ rootData[col] = foreignKey;
49
+ });
50
+ }
51
+ const fullRootResult = (await tableHandler.insert(rootData, { returning: "*", onConflict: insertParams?.onConflict }, undefined,
52
+ /** Remove requiredNestedInserts check before doing the actual insert */
53
+ tableRules?.insert?.requiredNestedInserts ?
54
+ {
55
+ ...tableRules,
56
+ insert: {
57
+ ...tableRules.insert,
58
+ requiredNestedInserts: tableRules.insert.requiredNestedInserts.filter(({ ftable }) => !extraKeys.includes(ftable)),
59
+ },
60
+ }
61
+ : tableRules, localParams));
62
+ let returnData;
63
+ const returning = insertParams?.returning;
64
+ if (returning) {
65
+ returnData = {};
66
+ const returningItems = await this.prepareReturning(returning, this.parseFieldFilter(tableRules?.insert?.returningFields));
67
+ returningItems
68
+ .filter((s) => s.selected)
69
+ .map((rs) => {
70
+ const colInsertResult = colInsertsResult.find(({ insertedFieldName }) => insertedFieldName === rs.columnName);
71
+ const inserted = colInsertResult?.singleInsert ? colInsertResult.inserted?.[0] : colInsertResult?.inserted;
72
+ returnData[rs.alias] = inserted ?? fullRootResult[rs.alias];
73
+ });
74
+ }
75
+ for (const targetTable of extraKeys) {
76
+ const childDataItems = (Array.isArray(row[targetTable]) ?
77
+ row[targetTable]
78
+ : [row[targetTable]]);
79
+ /** check */
80
+ if (childDataItems.some((d) => !(0, prostgles_types_1.isObject)(d))) {
81
+ throw "Expected array of objects";
82
+ }
83
+ const childInsert = async (cdata, tableName) => {
84
+ return referencedInsert(this, dbTX, localParams, tableName, cdata, rootOnConflict);
85
+ };
86
+ const joinPath = getJoinPath(this, targetTable);
87
+ const { path } = joinPath;
88
+ const [tbl1, tbl2, tbl3] = path;
89
+ targetTableRules = await (0, getInsertTableRules_1.getInsertTableRules)(this, targetTable, localParams?.clientReq, localParams?.scope);
90
+ const cols2 = this.dboBuilder.dbo[tbl2].columns || [];
91
+ if (!this.dboBuilder.dbo[tbl2])
92
+ throw "Invalid/disallowed table: " + tbl2;
93
+ const colsRefT1 = cols2.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl1));
94
+ if (!path.length) {
95
+ throw "Nested inserts join path not found for " + [this.name, targetTable].join(", ");
96
+ }
97
+ else if (path.length === 2) {
98
+ if (targetTable !== tbl2)
99
+ throw "Did not expect this";
100
+ if (!colsRefT1.length) {
101
+ throw `Target table ${tbl2} does not reference any columns from the root table ${this.name}. Cannot insert nested data`;
102
+ }
103
+ insertedChildren = await childInsert(childDataItems.map((d) => {
104
+ const result = { ...d };
105
+ colsRefT1.map((col) => {
106
+ result[col.references[0].cols[0]] = fullRootResult[col.references[0].fcols[0]];
107
+ });
108
+ return result;
109
+ }), targetTable);
110
+ }
111
+ else if (path.length === 3) {
112
+ if (targetTable !== tbl3)
113
+ throw "Did not expect this";
114
+ const colsRefT3 = cols2.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl3));
115
+ if (!colsRefT1.length || !colsRefT3.length)
116
+ throw "Incorrectly referenced or missing columns for nested insert";
117
+ const fileTable = this.dboBuilder.prostgles.fileManager?.tableName;
118
+ if (targetTable !== fileTable) {
119
+ throw "Only media allowed to have nested inserts more than 2 tables apart";
120
+ }
121
+ /* We expect tbl2 to have only 2 columns (media_id and foreign_id) */
122
+ if (!(cols2.filter((c) => c.references?.[0]?.ftable === fileTable).length === 1 &&
123
+ cols2.filter((c) => c.references?.[0]?.ftable === tableHandler.name).length === 1)) {
124
+ console.log({
125
+ tbl1,
126
+ tbl2,
127
+ tbl3,
128
+ name: tableHandler.name,
129
+ tthisName: this.name,
130
+ });
131
+ throw ("Second joining table (" +
132
+ tbl2 +
133
+ ") not of expected format. Must contain exactly one reference column for each table (file table and target table) ");
134
+ }
135
+ insertedChildren = await childInsert(childDataItems, targetTable);
136
+ /* Insert in key_lookup table */
137
+ await Promise.all(insertedChildren.map(async (t3Child) => {
138
+ const tbl2Row = {};
139
+ colsRefT3.map((col) => {
140
+ tbl2Row[col.name] = t3Child[col.references[0].fcols[0]];
141
+ });
142
+ colsRefT1.map((col) => {
143
+ tbl2Row[col.name] = fullRootResult[col.references[0].fcols[0]];
144
+ });
145
+ await childInsert(tbl2Row, tbl2);
146
+ }));
147
+ }
148
+ else {
149
+ console.error(JSON.stringify({ path, thisTable: this.name, targetTable }, null, 2));
150
+ throw "Unexpected path for Nested inserts";
151
+ }
152
+ /* Return also the nested inserted data */
153
+ if (insertedChildren.length && returning) {
154
+ const targetTableHandler = dbTX[targetTable];
155
+ const targetReturning = await targetTableHandler.prepareReturning("*", targetTableHandler.parseFieldFilter(targetTableRules.insert?.returningFields));
156
+ const clientTargetInserts = insertedChildren.map((d) => {
157
+ const _d = { ...d };
158
+ const res = {};
159
+ targetReturning.map((r) => {
160
+ res[r.alias] = _d[r.alias];
161
+ });
162
+ return res;
163
+ });
164
+ returnData[targetTable] =
165
+ clientTargetInserts.length === 1 ? clientTargetInserts[0] : clientTargetInserts;
166
+ }
167
+ }
168
+ return returnData;
169
+ }
170
+ const getJoinPath = (tableHandler, targetTable) => {
171
+ const jp = tableHandler.dboBuilder.getShortestJoinPath(tableHandler, targetTable);
172
+ if (!jp) {
173
+ const pref = tableHandler.dboBuilder.prostgles.opts.joins !== "inferred" ? "Joins are not inferred! " : "";
174
+ throw new Error(`${pref}Could not find a single join path for the nested data ( sourceTable: ${tableHandler.name} targetTable: ${targetTable} ) `);
175
+ }
176
+ return jp;
177
+ };
178
+ const referencedInsert = async (tableHandler, dbTX, localParams, targetTable, targetData, onConflict) => {
179
+ getJoinPath(tableHandler, targetTable);
180
+ if (!dbTX?.[targetTable] || !("insert" in dbTX[targetTable])) {
181
+ throw new Error("childInsertErr: Table handler missing for referenced table: " + targetTable);
182
+ }
183
+ const childRules = await (0, getInsertTableRules_1.getInsertTableRules)(tableHandler, targetTable, localParams?.clientReq, localParams?.scope);
184
+ return Promise.all((Array.isArray(targetData) ? targetData : [targetData]).map((m) => dbTX[targetTable]
185
+ .insert(m, { returning: "*", onConflict }, undefined, childRules, localParams)
186
+ .catch((e) => {
187
+ return Promise.reject(e);
188
+ })));
189
+ };
190
+ //# sourceMappingURL=insertRowWithNestedRecords.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"insertRowWithNestedRecords.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/TableHandler/insert/insertRowWithNestedRecords.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;AAGnD,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,CA6L3B"}
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;AAInD,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,CA6L3B"}
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.update = update;
4
4
  const DboBuilder_1 = require("../DboBuilder");
5
5
  const DataValidator_1 = require("./DataValidator");
6
- const insertNestedRecords_1 = require("./insert/insertNestedRecords");
6
+ const getReferenceColumnInserts_1 = require("./insert/getReferenceColumnInserts");
7
7
  const runInsertUpdateQuery_1 = require("./runInsertUpdateQuery");
8
8
  const updateFile_1 = require("./updateFile");
9
+ const getInsertTableRules_1 = require("./insert/getInsertTableRules");
9
10
  async function update(filter, _newData, params, tableRules, localParams) {
10
11
  const ACTION = "update";
11
12
  const start = Date.now();
@@ -70,7 +71,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
70
71
  * Nested inserts
71
72
  */
72
73
  const nData = { ...data };
73
- const nestedInserts = (0, insertNestedRecords_1.getReferenceColumnInserts)(this, nData, true);
74
+ const nestedInserts = (0, getReferenceColumnInserts_1.getReferenceColumnInserts)(this, nData, true);
74
75
  const nestedInsertsResultsObj = {};
75
76
  if (nestedInserts.length) {
76
77
  const updateCount = await this.count(updateFilter.filter);
@@ -84,7 +85,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
84
85
  const nesedTableHandler = finalDBtx[nestedInsert.tableName];
85
86
  if (!nesedTableHandler)
86
87
  throw `nestedInsert Tablehandler not found for ${nestedInsert.tableName}`;
87
- const refTableRules = !localParams ? undefined : (await (0, insertNestedRecords_1.getInsertTableRules)(this, nestedInsert.tableName, localParams.clientReq, localParams.scope));
88
+ const refTableRules = !localParams ? undefined : (await (0, getInsertTableRules_1.getInsertTableRules)(this, nestedInsert.tableName, localParams.clientReq, localParams.scope));
88
89
  const nestedLocalParams = {
89
90
  ...localParams,
90
91
  nestedInsert: {
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ import type { AuthClientRequest } from "../../../Auth/AuthTypes";
2
+ import type { LocalParams } from "../../DboBuilder";
3
+ import type { TableHandler } from "../TableHandler";
4
+
5
+ /* Must be allowed to insert into referenced table */
6
+ export const getInsertTableRules = async (
7
+ tableHandler: TableHandler,
8
+ targetTable: string,
9
+ clientReq: AuthClientRequest | undefined,
10
+ scope: LocalParams["scope"],
11
+ ) => {
12
+ const childRules = await tableHandler.dboBuilder.publishParser?.getValidatedRequestRuleWusr(
13
+ {
14
+ tableName: targetTable,
15
+ command: "insert",
16
+ clientReq,
17
+ },
18
+ scope,
19
+ );
20
+ if (!childRules || !childRules.insert)
21
+ throw "Dissallowed nested insert into table " + targetTable;
22
+ return childRules;
23
+ };
@@ -0,0 +1,64 @@
1
+ import type { AnyObject, ColumnInfo } from "prostgles-types";
2
+ import { getPossibleNestedInsert, isDefined, isObject } from "prostgles-types";
3
+ import type { TableHandler } from "../TableHandler";
4
+
5
+ export type ReferenceColumnInsert<ExpectSingleInsert> = {
6
+ tableName: string;
7
+ insertedFieldName: string;
8
+ insertedFieldRef: Required<ColumnInfo>["references"][number];
9
+ singleInsert: boolean;
10
+ data: ExpectSingleInsert extends true ? AnyObject : AnyObject | AnyObject[];
11
+ };
12
+
13
+ /**
14
+ * Insert through the reference column. e.g.:
15
+ * {
16
+ * root_field: "data",
17
+ * fkey_column: { ...referenced_table_data }
18
+ * }
19
+ */
20
+ export const getReferenceColumnInserts = <ExpectSingleInsert extends boolean>(
21
+ tableHandler: TableHandler,
22
+ parentRow: AnyObject,
23
+ expectSingleInsert?: ExpectSingleInsert,
24
+ ): ReferenceColumnInsert<ExpectSingleInsert>[] => {
25
+ return Object.entries(parentRow)
26
+ .map(([insertedFieldName, insertedFieldValue]) => {
27
+ if (insertedFieldValue && isObject(insertedFieldValue)) {
28
+ const insertedRefCol = tableHandler.columns.find(
29
+ (c) => c.name === insertedFieldName && c.references?.length,
30
+ );
31
+ if (!insertedRefCol) return undefined;
32
+ const insertedFieldRef = getPossibleNestedInsert(
33
+ insertedRefCol,
34
+ tableHandler.dboBuilder.tablesOrViews ?? [],
35
+ false,
36
+ );
37
+ return (
38
+ insertedFieldRef && {
39
+ insertedFieldName,
40
+ insertedFieldRef,
41
+ }
42
+ );
43
+ }
44
+
45
+ return undefined;
46
+ })
47
+ .filter(isDefined)
48
+ .map(({ insertedFieldName, insertedFieldRef }) => {
49
+ const singleInsert = !Array.isArray(parentRow[insertedFieldName]);
50
+ if (expectSingleInsert && !singleInsert) {
51
+ throw "Expected singleInsert";
52
+ }
53
+ const res = {
54
+ tableName: insertedFieldRef.ftable,
55
+ insertedFieldName,
56
+ insertedFieldRef,
57
+ singleInsert,
58
+ data: parentRow[insertedFieldName] as typeof singleInsert extends true ? AnyObject
59
+ : AnyObject[],
60
+ };
61
+ return res;
62
+ })
63
+ .filter(isDefined);
64
+ };