prostgles-server 4.2.631 → 4.2.634
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/debug/client-schema-types/a94d5cf8/DBGeneratedSchema.ts +102 -0
- package/debug/client-schema-types/aa40d42e/DBGeneratedSchema.ts +102 -0
- package/debug/client-schema-types/b5b54baa/DBGeneratedSchema.ts +102 -0
- package/debug/client-schema-types/e4696dfd/DBGeneratedSchema.ts +102 -0
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +1 -14
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +2 -2
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js +15 -62
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.d.ts.map +1 -1
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.js +24 -9
- package/dist/DboBuilder/joins/prepareShortestJoinPaths.js.map +1 -1
- package/dist/StorageClient/getFileTableConfig.d.ts.map +1 -1
- package/dist/StorageClient/getFileTableConfig.js +15 -5
- package/dist/StorageClient/getFileTableConfig.js.map +1 -1
- package/dist/TableConfig/TableConfigTypes.d.ts +1 -15
- package/dist/TableConfig/TableConfigTypes.d.ts.map +1 -1
- package/dist/TableConfig/TableConfigurator.d.ts +0 -2
- package/dist/TableConfig/TableConfigurator.d.ts.map +1 -1
- package/dist/TableConfig/TableConfigurator.js +0 -24
- package/dist/TableConfig/TableConfigurator.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js +1 -4
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/lib/DboBuilder/DboBuilder.ts +1 -16
- package/lib/DboBuilder/TableHandler/TableHandler.ts +1 -1
- package/lib/DboBuilder/TableHandler/updateFile.ts +2 -2
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +2 -2
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +26 -87
- package/lib/DboBuilder/joins/prepareShortestJoinPaths.ts +32 -15
- package/lib/StorageClient/getFileTableConfig.ts +18 -6
- package/lib/TableConfig/TableConfigTypes.ts +0 -17
- package/lib/TableConfig/TableConfigurator.ts +0 -26
- package/lib/TableConfig/getTableColumnQueries.ts +1 -4
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AAUA,qDAAqE;AAQrE,6CAAkD;AAElD,8CAAoE;AAEpE,iFAA8E;AAC9E,8CAA2C;AAE3C,mCAAgC;AAChC,iCAA2C;AAC3C,mEAAgE;AAChE,uCAAoC;AACpC,yDAAsD;AACtD,iCAA8B;AAE9B,2CAAwC;AACxC,2DAAwD;AAQxD,MAAa,WAAW;IACtB,EAAE,CAAK;IACP,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,OAAO,CAAyB;IAChC,eAAe,CAAe;IAC9B,YAAY,CAAW;IACvB,SAAS,CAAc;IACvB,eAAe,CAAc;IAC7B,YAAY,GAAa,EAAE,CAAC;IAC5B,KAAK,CAAS;IACd,SAAS,CAAS;IAClB,SAAS,
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,WAAW,
|
|
1
|
+
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,kFAM3B,iBAAiB,KAAG,cAAc,EAgDpC,CAAC"}
|
|
@@ -23,10 +23,10 @@ const parseJoinPath = ({ rawPath, rootTable, viewHandler, allowMultiOrJoin = fal
|
|
|
23
23
|
});
|
|
24
24
|
joinInfo.paths.forEach((path) => {
|
|
25
25
|
/** Check if join tables are valid */
|
|
26
|
-
if (!viewHandler.dboBuilder.
|
|
26
|
+
if (!viewHandler.dboBuilder.dboMap.get(path.table)) {
|
|
27
27
|
throw {
|
|
28
28
|
stack: ["prepareExistCondition()"],
|
|
29
|
-
message: `Invalid or
|
|
29
|
+
message: `Invalid or disallowed table in join path: ${path.table}`,
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
result.push({
|
|
@@ -57,7 +57,7 @@ exports.parseJoinPath = parseJoinPath;
|
|
|
57
57
|
* Returns all tables and fields required to join from source table to target table
|
|
58
58
|
* Respecting the path.on condition
|
|
59
59
|
*/
|
|
60
|
-
|
|
60
|
+
const getJoins = (viewHandler, source, path, { allowMultiOrJoin = true, getShortestJoin } = {}) => {
|
|
61
61
|
const [lastItem] = path;
|
|
62
62
|
if (!lastItem) {
|
|
63
63
|
throw `Empty path`;
|
|
@@ -66,63 +66,24 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
66
66
|
throw `getShortestJoin requires exactly 1 path item`;
|
|
67
67
|
}
|
|
68
68
|
const target = lastItem.table;
|
|
69
|
-
if (!viewHandler.joinPaths) {
|
|
70
|
-
throw `Join info missing`;
|
|
71
|
-
}
|
|
72
|
-
/* Self join */
|
|
73
|
-
if (source === target) {
|
|
74
|
-
const tableHandler = viewHandler.dboBuilder.tablesOrViews?.find((t) => t.name === source);
|
|
75
|
-
if (!tableHandler)
|
|
76
|
-
throw `Table not found for joining ${source}`;
|
|
77
|
-
const fcols = tableHandler.columns.filter((c) => c.references?.some(({ ftable }) => ftable === viewHandler.name));
|
|
78
|
-
if (!fcols.length) {
|
|
79
|
-
throw `There is no self-join foreign key relationship for table ${JSON.stringify(target)}`;
|
|
80
|
-
}
|
|
81
|
-
let allOnJoins = [];
|
|
82
|
-
fcols.forEach((fc) => {
|
|
83
|
-
fc.references.forEach(({ fcols, cols }) => {
|
|
84
|
-
const fieldArr = fcols.map((fcol, i) => [fcol, cols[i]]);
|
|
85
|
-
allOnJoins.push(fieldArr);
|
|
86
|
-
});
|
|
87
|
-
});
|
|
88
|
-
allOnJoins = [
|
|
89
|
-
...allOnJoins,
|
|
90
|
-
/** Reverse as well */
|
|
91
|
-
...allOnJoins.map((constraint) => constraint.map(([left, right]) => [right, left])),
|
|
92
|
-
];
|
|
93
|
-
return {
|
|
94
|
-
paths: [
|
|
95
|
-
{
|
|
96
|
-
source,
|
|
97
|
-
target,
|
|
98
|
-
table: target,
|
|
99
|
-
on: getValidOn(lastItem.on, allOnJoins.map((v) => Object.fromEntries(v))),
|
|
100
|
-
},
|
|
101
|
-
],
|
|
102
|
-
expectOne: false,
|
|
103
|
-
};
|
|
104
|
-
}
|
|
105
69
|
/* Find the join path between tables */
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
return tableConfigJoinInfo;
|
|
109
|
-
const actualPath = getShortestJoin ?
|
|
110
|
-
viewHandler.joinPaths
|
|
70
|
+
const actualPath = getShortestJoin
|
|
71
|
+
? viewHandler.joinPaths
|
|
111
72
|
.find((j) => {
|
|
112
73
|
return j.t1 === source && j.t2 === target;
|
|
113
74
|
})
|
|
114
75
|
?.path.map((table) => ({ table, on: undefined }))
|
|
115
76
|
.slice(1)
|
|
116
|
-
:
|
|
77
|
+
: viewHandler.joinPaths.find((j) => {
|
|
117
78
|
return j.path.join() === [{ table: source }, ...path].map((p) => p.table).join();
|
|
118
|
-
})
|
|
119
|
-
path
|
|
79
|
+
})
|
|
80
|
+
? path
|
|
120
81
|
: undefined;
|
|
121
82
|
if (getShortestJoin && actualPath?.length && lastItem.on?.length) {
|
|
122
83
|
actualPath[actualPath.length - 1].on = lastItem.on;
|
|
123
84
|
}
|
|
124
85
|
if (!actualPath) {
|
|
125
|
-
throw `Joining ${source} <-...-> ${target}
|
|
86
|
+
throw `Joining ${source} <-...-> ${target} disallowed or missing`;
|
|
126
87
|
}
|
|
127
88
|
/* Make the join chain info */
|
|
128
89
|
const paths = [];
|
|
@@ -130,9 +91,11 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
130
91
|
const prevTable = arr[i - 1];
|
|
131
92
|
const t1 = i === 0 ? source : prevTable.table;
|
|
132
93
|
/* Get join options */
|
|
133
|
-
const join = viewHandler.joins.find((
|
|
94
|
+
const join = viewHandler.joins.find(({ tables: [left, right] }) => {
|
|
95
|
+
return ((left === t1 && right === tablePath.table) || (right === t1 && left === tablePath.table));
|
|
96
|
+
});
|
|
134
97
|
if (!join) {
|
|
135
|
-
throw `Joining ${t1} <-> ${tablePath.table}
|
|
98
|
+
throw `Joining ${t1} <-> ${tablePath.table} disallowed or missing`;
|
|
136
99
|
}
|
|
137
100
|
const isLtr = join.tables[0] === t1;
|
|
138
101
|
const joinOn = isLtr ? join.on : (0, prostgles_types_1.reverseJoinOn)(join.on);
|
|
@@ -145,16 +108,6 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
145
108
|
});
|
|
146
109
|
});
|
|
147
110
|
const expectOne = false;
|
|
148
|
-
// paths.map(({ source, target, on }, i) => {
|
|
149
|
-
// if(expectOne && on.length === 1){
|
|
150
|
-
// const sourceCol = on[0][1];
|
|
151
|
-
// const targetCol = on[0][0];
|
|
152
|
-
// const sCol = this.dboBuilder.dbo[source].columns.find(c => c.name === sourceCol)
|
|
153
|
-
// const tCol = this.dboBuilder.dbo[target].columns.find(c => c.name === targetCol)
|
|
154
|
-
// console.log({ sourceCol, targetCol, sCol, source, tCol, target, on})
|
|
155
|
-
// expectOne = sCol.is_pkey && tCol.is_pkey
|
|
156
|
-
// }
|
|
157
|
-
// })
|
|
158
111
|
const isMultiOrJoin = paths.find((p) => p.on.length > 1);
|
|
159
112
|
if (!allowMultiOrJoin && isMultiOrJoin) {
|
|
160
113
|
throw `Table ${JSON.stringify(source)} can join to ${JSON.stringify(target)} through multiple constraints. Must chose one of ${JSON.stringify(isMultiOrJoin.on)}`;
|
|
@@ -163,7 +116,7 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
163
116
|
paths,
|
|
164
117
|
expectOne,
|
|
165
118
|
};
|
|
166
|
-
}
|
|
119
|
+
};
|
|
167
120
|
const getValidOn = (requested, possible) => {
|
|
168
121
|
if (!requested) {
|
|
169
122
|
return possible.map((v) => Object.entries(v));
|
|
@@ -182,6 +135,6 @@ const getValidOn = (requested, possible) => {
|
|
|
182
135
|
const conditionsMatch = (c1, c2) => {
|
|
183
136
|
const keys1 = Object.keys(c1);
|
|
184
137
|
const keys2 = Object.keys(c2);
|
|
185
|
-
return keys1.
|
|
138
|
+
return (keys1.toSorted().join() === keys2.toSorted().join() && keys1.every((key) => c1[key] === c2[key]));
|
|
186
139
|
};
|
|
187
140
|
//# sourceMappingURL=parseJoinPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":";;;AACA,qDAAgD;
|
|
1
|
+
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareShortestJoinPaths.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/joins/prepareShortestJoinPaths.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAI5D,KAAK,MAAM,GAAG;IACZ,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,iBAAiB,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,YAAY,UAAU,KAAG,
|
|
1
|
+
{"version":3,"file":"prepareShortestJoinPaths.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/joins/prepareShortestJoinPaths.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAI5D,KAAK,MAAM,GAAG;IACZ,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,iBAAiB,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,YAAY,UAAU,KAAG,MAmLjE,CAAC"}
|
|
@@ -7,18 +7,18 @@ const shortestPath_1 = require("./shortestPath");
|
|
|
7
7
|
const getInferredJoins_1 = require("./getInferredJoins");
|
|
8
8
|
const utils_1 = require("../../utils/utils");
|
|
9
9
|
const prepareShortestJoinPaths = (dboBuilder) => {
|
|
10
|
-
|
|
10
|
+
const { joins: joinConfigFromOpts } = dboBuilder.prostgles.opts;
|
|
11
|
+
if (!joinConfigFromOpts) {
|
|
11
12
|
return {
|
|
12
13
|
joins: [],
|
|
13
14
|
shortestJoinPaths: [],
|
|
14
15
|
};
|
|
15
16
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
joinConfig.forEach((join, index, configured) => {
|
|
17
|
+
if (Array.isArray(joinConfigFromOpts)) {
|
|
18
|
+
joinConfigFromOpts.forEach((join, index, configured) => {
|
|
19
19
|
const duplicate = configured
|
|
20
20
|
.slice(0, index)
|
|
21
|
-
.some((existing) => (0,
|
|
21
|
+
.some((existing) => (0, utils_1.sortedArraysMatch)(existing.tables, join.tables));
|
|
22
22
|
if (duplicate) {
|
|
23
23
|
throw new Error(`Duplicate configured join for table pair ${JSON.stringify(join.tables)}. Combine conditions in a single Join.on.`);
|
|
24
24
|
}
|
|
@@ -27,6 +27,7 @@ const prepareShortestJoinPaths = (dboBuilder) => {
|
|
|
27
27
|
if (!dboBuilder.tablesOrViews) {
|
|
28
28
|
throw new Error("Could not create join config. this.tablesOrViews missing");
|
|
29
29
|
}
|
|
30
|
+
let joinConfig = joinConfigFromOpts;
|
|
30
31
|
// The initial DBO is needed by tableConfig before its tables/columns exist.
|
|
31
32
|
// Defer only joins that cannot be resolved yet; the final rebuild validates all.
|
|
32
33
|
if (Array.isArray(joinConfig) && dboBuilder.prostgles.preparingTableConfig) {
|
|
@@ -49,7 +50,14 @@ const prepareShortestJoinPaths = (dboBuilder) => {
|
|
|
49
50
|
throw new Error("Unexpected joins init param. Expecting 'inferred' OR joinConfig but got: " +
|
|
50
51
|
JSON.stringify(joinConfig));
|
|
51
52
|
}
|
|
52
|
-
const joins =
|
|
53
|
+
const joins = structuredClone(joinConfig).map((join) => {
|
|
54
|
+
if (join.tables[0] !== join.tables[1])
|
|
55
|
+
return join;
|
|
56
|
+
return {
|
|
57
|
+
...join,
|
|
58
|
+
on: getUniqueJoinConditions([...join.on, ...(0, prostgles_types_1.reverseJoinOn)(join.on)]),
|
|
59
|
+
};
|
|
60
|
+
});
|
|
53
61
|
// Validate joins
|
|
54
62
|
try {
|
|
55
63
|
const tovNames = dboBuilder.tablesOrViews.map((t) => t.name);
|
|
@@ -104,7 +112,13 @@ const prepareShortestJoinPaths = (dboBuilder) => {
|
|
|
104
112
|
joinGraph[t2][t1] = 1;
|
|
105
113
|
});
|
|
106
114
|
const tables = Array.from(new Set(joins.flatMap((t) => t.tables)));
|
|
107
|
-
const shortestJoinPaths =
|
|
115
|
+
const shortestJoinPaths = joins
|
|
116
|
+
.filter(({ tables: [t1, t2] }) => t1 === t2)
|
|
117
|
+
.map(({ tables: [table] }) => ({
|
|
118
|
+
t1: table,
|
|
119
|
+
t2: table,
|
|
120
|
+
path: [table, table],
|
|
121
|
+
}));
|
|
108
122
|
tables.forEach((t1) => {
|
|
109
123
|
tables.forEach((t2) => {
|
|
110
124
|
/** Prevent recursion */
|
|
@@ -146,12 +160,12 @@ exports.prepareShortestJoinPaths = prepareShortestJoinPaths;
|
|
|
146
160
|
const mergeJoins = (inferred, configured) => {
|
|
147
161
|
const joins = [...inferred];
|
|
148
162
|
configured.forEach((join) => {
|
|
149
|
-
const index = joins.findIndex((existing) => (0,
|
|
163
|
+
const index = joins.findIndex((existing) => (0, utils_1.sortedArraysMatch)(existing.tables, join.tables));
|
|
150
164
|
const existing = joins[index];
|
|
151
165
|
const previousOn = !existing || join.override ? []
|
|
152
166
|
: existing.tables[0] === join.tables[0] ? existing.on
|
|
153
167
|
: (0, prostgles_types_1.reverseJoinOn)(existing.on);
|
|
154
|
-
const on = [...previousOn, ...join.on]
|
|
168
|
+
const on = getUniqueJoinConditions([...previousOn, ...join.on]);
|
|
155
169
|
const merged = { ...join, on };
|
|
156
170
|
if (existing) {
|
|
157
171
|
joins[index] = merged;
|
|
@@ -162,4 +176,5 @@ const mergeJoins = (inferred, configured) => {
|
|
|
162
176
|
});
|
|
163
177
|
return joins;
|
|
164
178
|
};
|
|
179
|
+
const getUniqueJoinConditions = (conditions) => conditions.filter((condition, index) => conditions.findIndex((candidate) => (0, prostgles_types_1.isEqual)(candidate, condition)) === index);
|
|
165
180
|
//# sourceMappingURL=prepareShortestJoinPaths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareShortestJoinPaths.js","sourceRoot":"","sources":["../../../lib/DboBuilder/joins/prepareShortestJoinPaths.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAGzD,yDAAkD;AAElD,iDAAkD;AAElD,yDAAsD;AACtD,6CAAsD;AAQ/C,MAAM,wBAAwB,GAAG,CAAC,UAAsB,EAAU,EAAE;IACzE,
|
|
1
|
+
{"version":3,"file":"prepareShortestJoinPaths.js","sourceRoot":"","sources":["../../../lib/DboBuilder/joins/prepareShortestJoinPaths.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAGzD,yDAAkD;AAElD,iDAAkD;AAElD,yDAAsD;AACtD,6CAAsD;AAQ/C,MAAM,wBAAwB,GAAG,CAAC,UAAsB,EAAU,EAAE;IACzE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO;YACL,KAAK,EAAE,EAAE;YACT,iBAAiB,EAAE,EAAE;SACtB,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtC,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACrD,MAAM,SAAS,GAAG,UAAU;iBACzB,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;iBACf,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,2CAA2C,CACnH,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,UAAU,GAAG,kBAAkB,CAAC;IAEpC,4EAA4E;IAC5E,iFAAiF;IACjF,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC3E,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC;QACxC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAClE,OAAO,CACL,KAAK;gBACL,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CACnE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAC7D,CACF,CACF,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,UAAU,GAAG,aAAa,CAAC;IAC7B,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QACnD,uEAAuE;IACzE,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,2EAA2E;YACzE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC7B,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnD,OAAO;YACL,GAAG,IAAI;YACP,EAAE,EAAE,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,IAAA,+BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SACrE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,iBAAiB;IACjB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE7D,0BAA0B;QAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,mBAAmB,GAAG,OAAO,CAAC;QACtC,CAAC;QAED,0BAA0B;QAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAClB,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACjB,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACd,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAC3B,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC5B;oBACE,CAAC,EAAE,EAAE,GAAG,CAAC;oBACT,CAAC,EAAE,EAAE,GAAG,CAAC;iBACV,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACV,MAAM,CAAC,GAAW,CAAC,CAAC,CAAC,CAAC,EACpB,CAAC,GAAa,CAAC,CAAC,CAAC,CAAC,CAAC;oBAErB,MAAM,GAAG,GAAG,UAAU,CAAC,aAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;oBAClE,IAAI,CAAC,GAAG;wBAAE,MAAM,mBAAmB,GAAG,CAAC,CAAC;oBACxC,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBACxE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;wBACd,MAAM,SAAS,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,0BAA0B,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;oBACjG,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,sCAAsC;QACtC,MAAM,cAAc,GAClB,qBAAqB,GAAG,2BAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/E,uEAAuE;QACvE,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,EAAE;YAAE,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC;QAEvF,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAI,EAAE;YAAE,MAAM,2BAA2B,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC;IAC3F,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,MAAM,GACV,CAAE,UAAkB,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,8BAA8B,GAAG,CAAC,CAAC;QAC/F,MAAM,MAAM,CAAC;IACf,CAAC;IAED,mBAAmB;IACnB,MAAM,SAAS,GAAU,EAAE,CAAC;IAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;QAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAC9B,EAAE,GAAG,EAAE,CAAC,CAAC,CAAE,EACX,EAAE,GAAG,EAAE,CAAC,CAAC,CAAE,CAAC;QAEd,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO;QAEtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAEtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAc,KAAK;SACvC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;SAC3C,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7B,EAAE,EAAE,KAAK;QACT,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;KACrB,CAAC,CAAC,CAAC;IACN,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACpB,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACpB,wBAAwB;YACxB,IACE,EAAE,KAAK,EAAE;gBACT,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC5B,IAAI,IAAA,yBAAiB,EAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;wBAChD,MAAM,YAAY,GAAG,IAAA,+BAAgB,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;wBACzD,IAAI,IAAA,yBAAiB,EAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;4BAClD,OAAO,IAAI,CAAC;wBACd,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,EACF,CAAC;gBACD,OAAO;YACT,CAAC;YAED,MAAM,cAAc,GAAG,IAAA,+BAAgB,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,CAAC,cAAc,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAAE,OAAO;YAElD,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxE,CAAC;YAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,iBAAiB,CAAC,IAAI,CAAC;oBACrB,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,EAAE;oBACN,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE;iBAC5C,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO;QACL,KAAK;QACL,iBAAiB;QACjB,SAAS;KACV,CAAC;AACJ,CAAC,CAAC;AAnLW,QAAA,wBAAwB,4BAmLnC;AAEF,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,UAAkB,EAAU,EAAE;IAClE,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC5B,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,UAAU,GACd,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YAC/B,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;gBACrD,CAAC,CAAC,IAAA,+BAAa,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,EAAE,GAAG,uBAAuB,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC;QAC/B,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,UAAsB,EAAc,EAAE,CACrE,UAAU,CAAC,MAAM,CACf,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CACnB,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,yBAAO,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC,KAAK,KAAK,CAC/E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableConfig.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAY3D,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/E,eAAO,MAAM,kBAAkB,GAC7B,KAAK,SAAS,KACb;IAAE,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"getFileTableConfig.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAY3D,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/E,eAAO,MAAM,kBAAkB,GAC7B,KAAK,SAAS,KACb;IAAE,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;CAsNvF,CAAC"}
|
|
@@ -36,6 +36,7 @@ const getFileTableConfig = (prg) => {
|
|
|
36
36
|
...fileTableDefinitions_1.FILE_TABLE_COLUMN_DEFINITIONS,
|
|
37
37
|
...(fileTable.versioning && fileTableDefinitions_1.FILE_TABLE_VERSION_COLUMN_DEFINITIONS),
|
|
38
38
|
};
|
|
39
|
+
const fileColumnDefinitionsColumnNames = (0, prostgles_types_1.getKeys)(fileColumnDefinitions);
|
|
39
40
|
const userFileTableConfig = tableConfig?.[fileTableName];
|
|
40
41
|
if (userFileTableConfig) {
|
|
41
42
|
if ("isLookupTable" in userFileTableConfig) {
|
|
@@ -103,12 +104,21 @@ const getFileTableConfig = (prg) => {
|
|
|
103
104
|
insert: 1,
|
|
104
105
|
update: 1,
|
|
105
106
|
},
|
|
106
|
-
validate: async ({ data:
|
|
107
|
+
validate: async ({ data: insertOrUpdateData, localParams, command, filter, dbx, onCommit, onRollback, }) => {
|
|
107
108
|
const tableHandler = dbx[fileTableName];
|
|
108
109
|
if (!tableHandler)
|
|
109
110
|
throw "Storage tableHandler not found";
|
|
110
|
-
(0,
|
|
111
|
-
|
|
111
|
+
const fileData = (0, prostgles_types_1.pickKeys)(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
112
|
+
/**
|
|
113
|
+
* File table config can be extended with extra columns.
|
|
114
|
+
* Allow updates that only target those columns without affecting the core file data
|
|
115
|
+
*/
|
|
116
|
+
const extraData = (0, prostgles_types_1.omitKeys)(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
117
|
+
if (command === "update" && (0, prostgles_types_1.isEmpty)(fileData)) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
(0, uploadFile_1.assertFileObjectValid)(fileData);
|
|
121
|
+
const { data: dataBlob, original_name, id, original_last_modified = null } = fileData;
|
|
112
122
|
const data = dataBlob;
|
|
113
123
|
if (command === "update") {
|
|
114
124
|
const { newData } = await (0, updateFile_1.updateFile)(tableHandler, fileTable, {
|
|
@@ -121,7 +131,7 @@ const getFileTableConfig = (prg) => {
|
|
|
121
131
|
original_last_modified,
|
|
122
132
|
});
|
|
123
133
|
return {
|
|
124
|
-
row: newData,
|
|
134
|
+
row: { ...newData, ...extraData },
|
|
125
135
|
hookContext: {
|
|
126
136
|
data,
|
|
127
137
|
},
|
|
@@ -137,7 +147,7 @@ const getFileTableConfig = (prg) => {
|
|
|
137
147
|
original_last_modified,
|
|
138
148
|
});
|
|
139
149
|
return {
|
|
140
|
-
row: media,
|
|
150
|
+
row: { ...media, ...extraData },
|
|
141
151
|
hookContext: {
|
|
142
152
|
data,
|
|
143
153
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, JSONB, MaybePromise, StrictUnion } from "prostgles-types";
|
|
2
|
-
import type { JoinInfo } from "../DboBuilder/DboBuilder";
|
|
3
2
|
import type { DB, DBHandlerServer } from "../Prostgles";
|
|
4
3
|
import type { SyncConfig } from "../PublishParser/PublishParser";
|
|
5
4
|
export type ColExtraInfo = {
|
|
@@ -123,18 +122,6 @@ type ReferencedColumn = BaseColumnTypes & {
|
|
|
123
122
|
onUpdate?: "CASCADE" | "SET NULL" | "RESTRICT" | "NO ACTION" | "SET DEFAULT";
|
|
124
123
|
};
|
|
125
124
|
};
|
|
126
|
-
type JoinDef = {
|
|
127
|
-
sourceTable: string;
|
|
128
|
-
targetTable: string;
|
|
129
|
-
on: JoinInfo["paths"][number]["on"];
|
|
130
|
-
};
|
|
131
|
-
/**
|
|
132
|
-
* Used in specifying a join path to a table. This column name can then be used in select
|
|
133
|
-
*/
|
|
134
|
-
type NamedJoinColumn = {
|
|
135
|
-
label?: string;
|
|
136
|
-
joinDef: JoinDef[];
|
|
137
|
-
};
|
|
138
125
|
type Enum<T extends string | number = any> = {
|
|
139
126
|
enum: T[] | readonly T[];
|
|
140
127
|
nullable?: boolean;
|
|
@@ -142,12 +129,11 @@ type Enum<T extends string | number = any> = {
|
|
|
142
129
|
};
|
|
143
130
|
export type ColumnConfig<LANG_IDS = {
|
|
144
131
|
en: 1;
|
|
145
|
-
}> = string | StrictUnion<
|
|
132
|
+
}> = string | StrictUnion<MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | Enum))>;
|
|
146
133
|
export type ColumnConfigs<LANG_IDS = {
|
|
147
134
|
en: 1;
|
|
148
135
|
}> = {
|
|
149
136
|
sql: string | (BaseColumn<LANG_IDS> & SQLDefColumn);
|
|
150
|
-
join: BaseColumn<LANG_IDS> & NamedJoinColumn;
|
|
151
137
|
media: BaseColumn<LANG_IDS> & MediaColumn;
|
|
152
138
|
referenced: BaseColumn<LANG_IDS> & ReferencedColumn;
|
|
153
139
|
text: BaseColumn<LANG_IDS> & TextColumn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfigTypes.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EACjB,KAAK,EACL,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"TableConfigTypes.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { ColumnInfo } from "prostgles-types";
|
|
2
|
-
import type { JoinInfo } from "../DboBuilder/DboBuilder";
|
|
3
2
|
import type { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
4
3
|
import type { ColExtraInfo, ColumnConfig, LangToTranslation } from "./TableConfigTypes";
|
|
5
4
|
/**
|
|
@@ -40,7 +39,6 @@ export declare class TableConfigurator {
|
|
|
40
39
|
table: string;
|
|
41
40
|
value?: number | string;
|
|
42
41
|
}) => void;
|
|
43
|
-
getJoinInfo: (sourceTable: string, targetTable: string) => JoinInfo | undefined;
|
|
44
42
|
prevInitQueryHistory?: string[];
|
|
45
43
|
initialising: boolean;
|
|
46
44
|
init: () => Promise<undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfigurator.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"TableConfigurator.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAExF;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,UAAU,SAA8B;IAExC,IAAI,MAAM,6CAET;IACD,IAAI,GAAG,IAAI,eAAe,CAGzB;IACD,IAAI,EAAE,IAAI,EAAE,CAGX;IACD,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAIhC,OAAO,sBAQL;IAEF,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAM;IAC9E,gBAAgB,sBAad;IAEF,eAAe,GAAI,WAAW,MAAM,EAAE,SAAS,MAAM,KAAG,YAAY,GAAG,SAAS,CAM9E;IAEF,kBAAkB,GAAI,WAAW,MAAM;;;;;kBASrC;IAEF,aAAa,GAAI,QAAQ;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,wBAS3D;IAEF,UAAU,GAAI,QAAQ;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,KAAG,CAAC,YAAY,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,SAAS,CAwBnF;IAEF,WAAW,GAAI,QAAQ;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAG,IAAI,CAUnF;IAEF,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,YAAY,UAAS;IACrB,IAAI,2BAA8B;CACnC;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,iBAAiB,EAAE,QAAQ;IAClE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,KAAG,SAAS,GAAG,MAWf,CAAC"}
|
|
@@ -108,30 +108,6 @@ class TableConfigurator {
|
|
|
108
108
|
throw `${params.col} must be less than ${max}`;
|
|
109
109
|
}
|
|
110
110
|
};
|
|
111
|
-
getJoinInfo = (sourceTable, targetTable) => {
|
|
112
|
-
const sourceTableConfig = this.config[sourceTable];
|
|
113
|
-
if (sourceTableConfig && "columns" in sourceTableConfig) {
|
|
114
|
-
const targetColConfig = sourceTableConfig.columns?.[targetTable];
|
|
115
|
-
if (targetColConfig) {
|
|
116
|
-
if ((0, prostgles_types_1.isObject)(targetColConfig) && "joinDef" in targetColConfig) {
|
|
117
|
-
if (!targetColConfig.joinDef)
|
|
118
|
-
throw "targetColConfig.joinDef missing";
|
|
119
|
-
const { joinDef } = targetColConfig;
|
|
120
|
-
const res = {
|
|
121
|
-
expectOne: false,
|
|
122
|
-
paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
|
|
123
|
-
source: sourceTable,
|
|
124
|
-
target: targetTable,
|
|
125
|
-
table,
|
|
126
|
-
on,
|
|
127
|
-
})),
|
|
128
|
-
};
|
|
129
|
-
return res;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
return undefined;
|
|
134
|
-
};
|
|
135
111
|
prevInitQueryHistory;
|
|
136
112
|
initialising = false;
|
|
137
113
|
init = initTableConfig_1.initTableConfig.bind(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfigurator.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":";;;AACA,qDAA2C;
|
|
1
|
+
{"version":3,"file":"TableConfigurator.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableColumnQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAU,6CAKzC,IAAI,KAAG,OAAO,CACb,SAAS,GACT;IACE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB,
|
|
1
|
+
{"version":3,"file":"getTableColumnQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAU,6CAKzC,IAAI,KAAG,OAAO,CACb,SAAS,GACT;IACE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB,CA4HJ,CAAC"}
|
|
@@ -32,10 +32,7 @@ const getTableColumnQueries = async ({ db, tableConf, tableName, tableHandler, }
|
|
|
32
32
|
throw err;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
const columns = (0, prostgles_types_1.getObjectEntries)(tableConf.columns)
|
|
36
|
-
/** Exclude NamedJoinColumn */
|
|
37
|
-
return typeof colDef === "string" || !("joinDef" in colDef);
|
|
38
|
-
});
|
|
35
|
+
const columns = (0, prostgles_types_1.getObjectEntries)(tableConf.columns);
|
|
39
36
|
const columnDefinitions = [];
|
|
40
37
|
for (const [colName, colConf] of columns) {
|
|
41
38
|
/* Get column definition */
|