prostgles-server 4.2.630 → 4.2.632
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/prostgles-server-4.2.630.tgz +0 -0
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js +27 -15
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +2 -2
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/TableHandler/uploadFile.d.ts +1 -0
- package/dist/DboBuilder/TableHandler/uploadFile.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/uploadFile.js +2 -1
- package/dist/DboBuilder/TableHandler/uploadFile.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/lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts +17 -4
- package/lib/DboBuilder/TableHandler/updateFile.ts +2 -2
- package/lib/DboBuilder/TableHandler/uploadFile.ts +3 -1
- package/lib/StorageClient/getFileTableConfig.ts +18 -6
- package/package.json +1 -1
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientDBGeneratedSchemas.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"getClientDBGeneratedSchemas.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAInE,6DAA6D;AAC7D,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,MAAM,EACN;IAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAAA;CAAE,CAC1E,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,oBAAoB,EAC9B,QAAQ,WAAW,EAAE,EACrB,QAAQ,WAAW,GAAG,SAAS,KAC9B,MAgHF,CAAC;AAKF,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,SAYpD,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateClientSchemaName = exports.getClientDBGeneratedSchemas = void 0;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
+
const uploadFile_1 = require("../DboBuilder/TableHandler/uploadFile");
|
|
5
6
|
const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
6
7
|
const entries = Object.entries(profiles).sort(([a], [b]) => a.localeCompare(b));
|
|
7
8
|
if (!entries.length)
|
|
@@ -25,6 +26,13 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
25
26
|
return [];
|
|
26
27
|
const inserting = published.filter((t) => t?.publishInfo.insert);
|
|
27
28
|
const tableType = `${constants_1.DB_GENERATED_NAMES.SCHEMA}[${JSON.stringify(table.name)}]`;
|
|
29
|
+
const fileWriteExcluded = table.columns
|
|
30
|
+
.filter((column) => !uploadFile_1.FILE_SCHEMA_KEYS.some((key) => key === column.name))
|
|
31
|
+
.map((column) => `${JSON.stringify(column.name)}?: never`)
|
|
32
|
+
.sort();
|
|
33
|
+
const fileWriteInput = published.some((t) => t?.isFileTable) ?
|
|
34
|
+
`Pick<${tableType}["columns"], ${uploadFile_1.FILE_SCHEMA_KEYS.map((v) => JSON.stringify(v)).join(" | ")}> & { ${fileWriteExcluded.join("; ")} }`
|
|
35
|
+
: undefined;
|
|
28
36
|
const required = [];
|
|
29
37
|
const optional = [];
|
|
30
38
|
const excluded = [];
|
|
@@ -41,13 +49,15 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
41
49
|
required.push(column.name);
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
|
-
const input = !inserting.length ? "never" : (
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
52
|
+
const input = !inserting.length ? "never" : ((fileWriteInput ??
|
|
53
|
+
([
|
|
54
|
+
required.length ? `Pick<${tableType}["columns"], ${keys(required)}>` : "",
|
|
55
|
+
optional.length ? `Partial<Pick<${tableType}["columns"], ${keys(optional)}>>` : "",
|
|
56
|
+
excluded.length ? `{ ${excluded.join("; ")} }` : "",
|
|
57
|
+
]
|
|
58
|
+
.filter(Boolean)
|
|
59
|
+
.join(" & ") ||
|
|
60
|
+
"Record<string, never>")));
|
|
51
61
|
const updating = published.filter((t) => t?.publishInfo.update);
|
|
52
62
|
const updateAllowed = table.columns
|
|
53
63
|
.filter((column) => updating.some((t) => t?.columns.some((c) => c.name === column.name && c.update)))
|
|
@@ -57,14 +67,16 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
57
67
|
.filter((column) => !updateAllowed.includes(column.name))
|
|
58
68
|
.map((column) => `${JSON.stringify(column.name)}?: never`)
|
|
59
69
|
.sort();
|
|
60
|
-
const updateInput = !updating.length ? "never" : (
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
70
|
+
const updateInput = !updating.length ? "never" : ((fileWriteInput ??
|
|
71
|
+
([
|
|
72
|
+
updateAllowed.length ?
|
|
73
|
+
`Partial<Pick<${tableType}["columns"], ${keys(updateAllowed)}>>`
|
|
74
|
+
: "",
|
|
75
|
+
updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
|
|
76
|
+
]
|
|
77
|
+
.filter(Boolean)
|
|
78
|
+
.join(" & ") ||
|
|
79
|
+
"Record<string, never>")));
|
|
68
80
|
const optionalTable = published.every(Boolean) ? "" : " optional: true;";
|
|
69
81
|
return [
|
|
70
82
|
` ${JSON.stringify(table.name)}: ${tableType} & { insertColumns: ${input}; updateColumns: ${updateInput};${optionalTable} };`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientDBGeneratedSchemas.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":";;;AAEA,2CAAiD;
|
|
1
|
+
{"version":3,"file":"getClientDBGeneratedSchemas.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,10 @@ const lockFileForUpdate = async (tableHandler, filter, where, localParams) => {
|
|
|
36
36
|
};
|
|
37
37
|
exports.lockFileForUpdate = lockFileForUpdate;
|
|
38
38
|
const getFileUpdateId = (filter) => {
|
|
39
|
-
const { data: validFilter } = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({ id: { optional: true, type: "string" } }, filter, "filter", undefined, { allowExtraProperties:
|
|
39
|
+
const { data: validFilter } = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({ id: { optional: true, type: "string" } }, filter, "filter", undefined, { allowExtraProperties: true });
|
|
40
40
|
const existingMediaId = validFilter?.id;
|
|
41
41
|
if (!existingMediaId) {
|
|
42
|
-
throw new Error(`Updating the file table with file data can only be done by providing a
|
|
42
|
+
throw new Error(`Updating the file table with file data can only be done by providing a filter that contains "id" and targets a single row`);
|
|
43
43
|
}
|
|
44
44
|
return existingMediaId;
|
|
45
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,8CAA8D;AAE9D,qDAAgF;AAIhF,6CAA+D;AAC/D,uFAAoF;AACpF,6EAA0E;AAQnE,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAQ,EAChG,EAAE;IACF,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAA6B,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,IAAA,qCAAiB,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,QAAQ;QACR,UAAU;QACV,aAAa;QACb,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC;QAC9C,sBAAsB;KACvB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,YAA0B,EAC1B,MAAiB,EACjB,KAAa,EACb,WAAoC,EACpC,EAAE;IACF,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxE,oEAAoE;IACpE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACvC,IAAA,wBAAW,EAAC,WAAW,EAAE,iBAAiB,YAAY,CAAC,WAAW,IAAI,KAAK,aAAa,EAAE,IAAI,CAAC,CAChG,CAAC;IACF,OAAO,CAAC,CAAC,GAAG,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B;AAEF,MAAM,eAAe,GAAG,CAAC,MAAiB,EAAU,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,8CAA8D;AAE9D,qDAAgF;AAIhF,6CAA+D;AAC/D,uFAAoF;AACpF,6EAA0E;AAQnE,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAQ,EAChG,EAAE;IACF,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAA6B,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,IAAA,qCAAiB,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,QAAQ;QACR,UAAU;QACV,aAAa;QACb,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC;QAC9C,sBAAsB;KACvB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,YAA0B,EAC1B,MAAiB,EACjB,KAAa,EACb,WAAoC,EACpC,EAAE;IACF,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxE,oEAAoE;IACpE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACvC,IAAA,wBAAW,EAAC,WAAW,EAAE,iBAAiB,YAAY,CAAC,WAAW,IAAI,KAAK,aAAa,EAAE,IAAI,CAAC,CAChG,CAAC;IACF,OAAO,CAAC,CAAC,GAAG,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B;AAEF,MAAM,eAAe,GAAG,CAAC,MAAiB,EAAU,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAC/B,CAAC;IACF,MAAM,eAAe,GAAG,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,2HAA2H,CAC5H,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
|
|
@@ -15,6 +15,7 @@ declare const FILE_SCHEMA: {
|
|
|
15
15
|
};
|
|
16
16
|
readonly data: "Blob";
|
|
17
17
|
};
|
|
18
|
+
export declare const FILE_SCHEMA_KEYS: ("data" | "id" | "original_name" | "original_last_modified")[];
|
|
18
19
|
type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
|
|
19
20
|
export declare const assertFileObjectValid: AssertFileObjectValid;
|
|
20
21
|
export type UploadFileArgs = TransactionCallbacks & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAgD,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAI3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,0CAA0C,CAAC;AAElD,QAAA,MAAM,WAAW;;;;;;;;;;;CAKP,CAAC;AAEX,eAAO,MAAM,gBAAgB,gEAAuB,CAAC;AAErD,KAAK,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,WAAW,CAAC,CAAC;AAElG,eAAO,MAAM,qBAAqB,EAAE,qBAanC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,QAAQ,eAAe,EACvB,uGASG,cAAc,KAChB,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAqE5E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.uploadFile = exports.assertFileObjectValid = void 0;
|
|
3
|
+
exports.uploadFile = exports.assertFileObjectValid = exports.FILE_SCHEMA_KEYS = void 0;
|
|
4
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
const getValidatedFileType_1 = require("../../StorageClient/getValidatedFileType");
|
|
@@ -12,6 +12,7 @@ const FILE_SCHEMA = {
|
|
|
12
12
|
original_last_modified: { type: "string", optional: true },
|
|
13
13
|
data: "Blob",
|
|
14
14
|
};
|
|
15
|
+
exports.FILE_SCHEMA_KEYS = (0, prostgles_types_1.getKeys)(FILE_SCHEMA);
|
|
15
16
|
const assertFileObjectValid = (row) => {
|
|
16
17
|
const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)(FILE_SCHEMA, row, "file insert", undefined, {
|
|
17
18
|
allowExtraProperties: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,6 +1,7 @@
|
|
|
1
1
|
import type { DBSchemaTable, TableSchema } from "prostgles-types";
|
|
2
2
|
import type { TableConfig } from "../TableConfig/TableConfigTypes";
|
|
3
3
|
import { DB_GENERATED_NAMES } from "./constants";
|
|
4
|
+
import { FILE_SCHEMA_KEYS } from "../DboBuilder/TableHandler/uploadFile";
|
|
4
5
|
|
|
5
6
|
/** Permissions compiled from publish profiles at startup. */
|
|
6
7
|
export type ClientSchemaProfiles = Record<
|
|
@@ -34,6 +35,14 @@ export const getClientDBGeneratedSchemas = (
|
|
|
34
35
|
if (!published.some(Boolean)) return [];
|
|
35
36
|
const inserting = published.filter((t) => t?.publishInfo.insert);
|
|
36
37
|
const tableType = `${DB_GENERATED_NAMES.SCHEMA}[${JSON.stringify(table.name)}]`;
|
|
38
|
+
const fileWriteExcluded = table.columns
|
|
39
|
+
.filter((column) => !FILE_SCHEMA_KEYS.some((key) => key === column.name))
|
|
40
|
+
.map((column) => `${JSON.stringify(column.name)}?: never`)
|
|
41
|
+
.sort();
|
|
42
|
+
const fileWriteInput =
|
|
43
|
+
published.some((t) => t?.isFileTable) ?
|
|
44
|
+
`Pick<${tableType}["columns"], ${FILE_SCHEMA_KEYS.map((v) => JSON.stringify(v)).join(" | ")}> & { ${fileWriteExcluded.join("; ")} }`
|
|
45
|
+
: undefined;
|
|
37
46
|
const required: string[] = [];
|
|
38
47
|
const optional: string[] = [];
|
|
39
48
|
const excluded: string[] = [];
|
|
@@ -54,13 +63,15 @@ export const getClientDBGeneratedSchemas = (
|
|
|
54
63
|
}
|
|
55
64
|
const input =
|
|
56
65
|
!inserting.length ? "never" : (
|
|
57
|
-
|
|
66
|
+
(fileWriteInput ??
|
|
67
|
+
([
|
|
58
68
|
required.length ? `Pick<${tableType}["columns"], ${keys(required)}>` : "",
|
|
59
69
|
optional.length ? `Partial<Pick<${tableType}["columns"], ${keys(optional)}>>` : "",
|
|
60
70
|
excluded.length ? `{ ${excluded.join("; ")} }` : "",
|
|
61
71
|
]
|
|
62
72
|
.filter(Boolean)
|
|
63
|
-
.join(" & ") ||
|
|
73
|
+
.join(" & ") ||
|
|
74
|
+
"Record<string, never>"))
|
|
64
75
|
);
|
|
65
76
|
const updating = published.filter((t) => t?.publishInfo.update);
|
|
66
77
|
const updateAllowed = table.columns
|
|
@@ -75,14 +86,16 @@ export const getClientDBGeneratedSchemas = (
|
|
|
75
86
|
.sort();
|
|
76
87
|
const updateInput =
|
|
77
88
|
!updating.length ? "never" : (
|
|
78
|
-
|
|
89
|
+
(fileWriteInput ??
|
|
90
|
+
([
|
|
79
91
|
updateAllowed.length ?
|
|
80
92
|
`Partial<Pick<${tableType}["columns"], ${keys(updateAllowed)}>>`
|
|
81
93
|
: "",
|
|
82
94
|
updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
|
|
83
95
|
]
|
|
84
96
|
.filter(Boolean)
|
|
85
|
-
.join(" & ") ||
|
|
97
|
+
.join(" & ") ||
|
|
98
|
+
"Record<string, never>"))
|
|
86
99
|
);
|
|
87
100
|
const optionalTable = published.every(Boolean) ? "" : " optional: true;";
|
|
88
101
|
return [
|
|
@@ -61,12 +61,12 @@ const getFileUpdateId = (filter: AnyObject): string => {
|
|
|
61
61
|
filter,
|
|
62
62
|
"filter",
|
|
63
63
|
undefined,
|
|
64
|
-
{ allowExtraProperties:
|
|
64
|
+
{ allowExtraProperties: true },
|
|
65
65
|
);
|
|
66
66
|
const existingMediaId = validFilter?.id;
|
|
67
67
|
if (!existingMediaId) {
|
|
68
68
|
throw new Error(
|
|
69
|
-
`Updating the file table with file data can only be done by providing a
|
|
69
|
+
`Updating the file table with file data can only be done by providing a filter that contains "id" and targets a single row`,
|
|
70
70
|
);
|
|
71
71
|
}
|
|
72
72
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from "crypto";
|
|
2
|
-
import { getJSONBObjectSchemaValidationError, type JSONB } from "prostgles-types";
|
|
2
|
+
import { getJSONBObjectSchemaValidationError, getKeys, type JSONB } from "prostgles-types";
|
|
3
3
|
import type { FileTableConfig } from "../../ProstglesTypes";
|
|
4
4
|
import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
|
|
5
5
|
import { getValidatedFileType } from "../../StorageClient/getValidatedFileType";
|
|
@@ -18,6 +18,8 @@ const FILE_SCHEMA = {
|
|
|
18
18
|
data: "Blob",
|
|
19
19
|
} as const;
|
|
20
20
|
|
|
21
|
+
export const FILE_SCHEMA_KEYS = getKeys(FILE_SCHEMA);
|
|
22
|
+
|
|
21
23
|
type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
|
|
22
24
|
|
|
23
25
|
export const assertFileObjectValid: AssertFileObjectValid = (row) => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { asName, omitKeys } from "prostgles-types";
|
|
1
|
+
import { asName, getKeys, isEmpty, omitKeys, pickKeys } from "prostgles-types";
|
|
2
2
|
import { md5 } from "prostgles-types/dist/md5";
|
|
3
3
|
import { onDeleteFromFileTable } from "../DboBuilder/TableHandler/onDeleteFromFileTable";
|
|
4
4
|
import { updateFile } from "../DboBuilder/TableHandler/updateFile";
|
|
@@ -58,6 +58,7 @@ export const getFileTableConfig = (
|
|
|
58
58
|
...FILE_TABLE_COLUMN_DEFINITIONS,
|
|
59
59
|
...(fileTable.versioning && FILE_TABLE_VERSION_COLUMN_DEFINITIONS),
|
|
60
60
|
};
|
|
61
|
+
const fileColumnDefinitionsColumnNames = getKeys(fileColumnDefinitions);
|
|
61
62
|
const userFileTableConfig = tableConfig?.[fileTableName];
|
|
62
63
|
if (userFileTableConfig) {
|
|
63
64
|
if ("isLookupTable" in userFileTableConfig) {
|
|
@@ -144,7 +145,7 @@ export const getFileTableConfig = (
|
|
|
144
145
|
update: 1,
|
|
145
146
|
},
|
|
146
147
|
validate: async ({
|
|
147
|
-
data:
|
|
148
|
+
data: insertOrUpdateData,
|
|
148
149
|
localParams,
|
|
149
150
|
command,
|
|
150
151
|
filter,
|
|
@@ -154,9 +155,20 @@ export const getFileTableConfig = (
|
|
|
154
155
|
}) => {
|
|
155
156
|
const tableHandler = dbx[fileTableName];
|
|
156
157
|
if (!tableHandler) throw "Storage tableHandler not found";
|
|
157
|
-
|
|
158
|
+
const fileData = pickKeys(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
158
159
|
|
|
159
|
-
|
|
160
|
+
/**
|
|
161
|
+
* File table config can be extended with extra columns.
|
|
162
|
+
* Allow updates that only target those columns without affecting the core file data
|
|
163
|
+
*/
|
|
164
|
+
const extraData = omitKeys(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
165
|
+
|
|
166
|
+
if (command === "update" && isEmpty(fileData)) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
assertFileObjectValid(fileData);
|
|
170
|
+
|
|
171
|
+
const { data: dataBlob, original_name, id, original_last_modified = null } = fileData;
|
|
160
172
|
const data = dataBlob as unknown as Buffer;
|
|
161
173
|
if (command === "update") {
|
|
162
174
|
const { newData } = await updateFile(tableHandler, fileTable, {
|
|
@@ -169,7 +181,7 @@ export const getFileTableConfig = (
|
|
|
169
181
|
original_last_modified,
|
|
170
182
|
});
|
|
171
183
|
return {
|
|
172
|
-
row: newData,
|
|
184
|
+
row: { ...newData, ...extraData },
|
|
173
185
|
hookContext: {
|
|
174
186
|
data,
|
|
175
187
|
},
|
|
@@ -187,7 +199,7 @@ export const getFileTableConfig = (
|
|
|
187
199
|
});
|
|
188
200
|
|
|
189
201
|
return {
|
|
190
|
-
row: media,
|
|
202
|
+
row: { ...media, ...extraData },
|
|
191
203
|
hookContext: {
|
|
192
204
|
data,
|
|
193
205
|
},
|