prostgles-server 4.2.665 → 4.2.667
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/DBSchemaBuilder/getCheckedTableColumns.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getCheckedTableColumns.js +3 -1
- package/dist/DBSchemaBuilder/getCheckedTableColumns.js.map +1 -1
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js +17 -28
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js.map +1 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js +2 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js.map +1 -1
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.d.ts +3 -1
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.js +13 -3
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.js.map +1 -1
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +7 -1
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.d.ts +3 -0
- package/dist/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.d.ts.map +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.js +76 -0
- package/dist/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.js.map +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js +3 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/TableHandler/uploadFile.d.ts +1 -1
- 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/DboBuilder/getColumns.d.ts.map +1 -1
- package/dist/DboBuilder/getColumns.js +1 -5
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/StorageClient/fileTableDefinitions.d.ts +2 -0
- package/dist/StorageClient/fileTableDefinitions.d.ts.map +1 -1
- package/dist/StorageClient/fileTableDefinitions.js +1 -0
- package/dist/StorageClient/fileTableDefinitions.js.map +1 -1
- package/dist/StorageClient/getFileTableConfig.d.ts.map +1 -1
- package/dist/StorageClient/getFileTableConfig.js +2 -2
- package/dist/StorageClient/getFileTableConfig.js.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts +5 -0
- package/dist/WebsocketAPI/getClientHandlers.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.js +29 -22
- package/dist/WebsocketAPI/getClientHandlers.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCheckedTableColumns.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getCheckedTableColumns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAKnE,eAAO,MAAM,sBAAsB,GACjC,QAAQ,WAAW,GAAG,SAAS,EAC/B,aAAa,WAAW,EACxB,eAAe,WAAW,EAAE,KAC3B,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"getCheckedTableColumns.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getCheckedTableColumns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAKnE,eAAO,MAAM,sBAAsB,GACjC,QAAQ,WAAW,GAAG,SAAS,EAC/B,aAAa,WAAW,EACxB,eAAe,WAAW,EAAE,KAC3B,MAAM,GAAG,SA6CX,CAAC"}
|
|
@@ -36,7 +36,9 @@ ${columns
|
|
|
36
36
|
.trim()
|
|
37
37
|
.replace(/;$/, "")
|
|
38
38
|
: values.map((value) => JSON.stringify(value)).join(" | ");
|
|
39
|
-
const optional = column.has_default ||
|
|
39
|
+
const optional = column.has_default ||
|
|
40
|
+
values.includes(null) ||
|
|
41
|
+
tableConfig.syncConfig?.synced_field === column.name;
|
|
40
42
|
return ` ${(0, utils_1.escapeTSNames)(column.name)}${optional ? "?" : ""}: ${dataType};`;
|
|
41
43
|
})
|
|
42
44
|
.join("\n")}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCheckedTableColumns.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getCheckedTableColumns.ts"],"names":[],"mappings":";;;AAAA,qDAA6D;AAE7D,gEAAqE;AACrE,0CAA+C;AAC/C,mFAA6F;AAEtF,MAAM,sBAAsB,GAAG,CACpC,MAA+B,EAC/B,WAAwB,EACxB,aAA4B,EACR,EAAE;IACtB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK;QAAE,OAAO;IAC5E,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAG,IAAA,qCAAqB,EACpC,WAAW,CAAC,KAAK,EACjB,OAAO;SACJ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,QAAQ,EAAE,CAAC,CAAC,WAAW;QACvB,QAAQ,EAAE,CAAC,CAAC,QAAQ;KACrB,CAAC,CAAC,CACN,CAAC;IACF,OAAO,QAAQ;SACZ,GAAG,CACF,CAAC,MAAM,EAAE,EAAE,CAAC;EAChB,OAAO;SACN,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,IAAA,6DAA6B,EAAC,IAAI,CAAC,EAAE,CAAC;QAC/F,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,0BAAQ,EAAC,SAAS,CAAC,IAAI,KAAK,IAAI,SAAS,CAAC;QAC1D,MAAM,MAAM,GACV,IAAA,0BAAQ,EAAC,SAAS,CAAC,CAAC,CAAC;YACnB,MAAM,IAAI,SAAS,CAAC,CAAC;gBACnB,SAAS,CAAC,IAAI;gBAChB,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChB,MAAM,QAAQ,GACZ,OAAO,CAAC,CAAC;YACP,IAAA,2CAAW,EAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC;iBAChE,IAAI,EAAE;iBACN,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACtB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"getCheckedTableColumns.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getCheckedTableColumns.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAGnE,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,MAkHF,CAAC;AAKF,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,SAYpD,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
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");
|
|
6
5
|
const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
7
6
|
const entries = Object.entries(profiles).sort(([a], [b]) => a.localeCompare(b));
|
|
8
7
|
if (!entries.length)
|
|
@@ -26,13 +25,7 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
26
25
|
return [];
|
|
27
26
|
const inserting = published.filter((t) => t?.publishInfo.insert);
|
|
28
27
|
const tableType = `${constants_1.DB_GENERATED_NAMES.SCHEMA}[${JSON.stringify(table.name)}]`;
|
|
29
|
-
const
|
|
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
|
+
const writeColumnType = `${tableType}["${published.some((t) => t?.isFileTable) ? "insertColumns" : "columns"}"]`;
|
|
36
29
|
const required = [];
|
|
37
30
|
const optional = [];
|
|
38
31
|
const excluded = [];
|
|
@@ -49,15 +42,13 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
49
42
|
required.push(column.name);
|
|
50
43
|
}
|
|
51
44
|
}
|
|
52
|
-
const input = !inserting.length ? "never" : (
|
|
53
|
-
(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
.join(" & ") ||
|
|
60
|
-
"Record<string, never>")));
|
|
45
|
+
const input = !inserting.length ? "never" : ([
|
|
46
|
+
required.length ? `Pick<${writeColumnType}, ${keys(required)}>` : "",
|
|
47
|
+
optional.length ? `Partial<Pick<${writeColumnType}, ${keys(optional)}>>` : "",
|
|
48
|
+
excluded.length ? `{ ${excluded.join("; ")} }` : "",
|
|
49
|
+
]
|
|
50
|
+
.filter(Boolean)
|
|
51
|
+
.join(" & ") || "Record<string, never>");
|
|
61
52
|
const updating = published.filter((t) => t?.publishInfo.update);
|
|
62
53
|
const updateAllowed = table.columns
|
|
63
54
|
.filter((column) => updating.some((t) => t?.columns.some((c) => c.name === column.name && c.update)))
|
|
@@ -67,16 +58,14 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
67
58
|
.filter((column) => !updateAllowed.includes(column.name))
|
|
68
59
|
.map((column) => `${JSON.stringify(column.name)}?: never`)
|
|
69
60
|
.sort();
|
|
70
|
-
const updateInput = !updating.length ? "never" : (
|
|
71
|
-
|
|
72
|
-
updateAllowed
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
.join(" & ") ||
|
|
79
|
-
"Record<string, never>")));
|
|
61
|
+
const updateInput = !updating.length ? "never" : ([
|
|
62
|
+
updateAllowed.length ?
|
|
63
|
+
`Partial<Pick<${writeColumnType}, ${keys(updateAllowed)}>>`
|
|
64
|
+
: "",
|
|
65
|
+
updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
|
|
66
|
+
]
|
|
67
|
+
.filter(Boolean)
|
|
68
|
+
.join(" & ") || "Record<string, never>");
|
|
80
69
|
const optionalTable = published.every(Boolean) ? "" : " optional: true;";
|
|
81
70
|
const tableConfig = config?.[table.name];
|
|
82
71
|
const preserveVariants = (input) => {
|
|
@@ -86,7 +75,7 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
86
75
|
input === "never") {
|
|
87
76
|
return input;
|
|
88
77
|
}
|
|
89
|
-
const columns =
|
|
78
|
+
const columns = writeColumnType;
|
|
90
79
|
return `(${columns} extends infer Row extends ${columns} ? Row extends unknown ? ${input.replaceAll(columns, "Row")} : never : never)`;
|
|
91
80
|
};
|
|
92
81
|
return [
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAInE,eAAO,MAAM,6BAA6B,GAAI,iDAK3C;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;CACxC,
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAInE,eAAO,MAAM,6BAA6B,GAAI,iDAK3C;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;CACxC,WAgBA,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,iDAKzB;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;CACxC,WAuCA,CAAC"}
|
|
@@ -17,7 +17,8 @@ const getColumnTypescriptDefinition = ({ config, tablesOrViews, tableOrView, col
|
|
|
17
17
|
column,
|
|
18
18
|
});
|
|
19
19
|
const { name, is_nullable, has_default } = column;
|
|
20
|
-
|
|
20
|
+
const isSyncedField = config?.[tableOrView.name]?.syncConfig?.synced_field === name;
|
|
21
|
+
return `${(0, utils_1.escapeTSNames)(name)}${is_nullable || has_default || isSyncedField ? "?" : ""}: ${dataType}`;
|
|
21
22
|
};
|
|
22
23
|
exports.getColumnTypescriptDefinition = getColumnTypescriptDefinition;
|
|
23
24
|
const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":";;;AAAA,qDAQyB;AAEzB,0CAA+C;AAE/C,oEAAiE;AACjE,iEAA8D;AAEvD,MAAM,6BAA6B,GAAG,CAAC,EAC5C,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GAMP,EAAE,EAAE;IACH;;;OAGG;IAEH,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC;QAC3B,MAAM;QACN,aAAa;QACb,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { type TableSchema } from "prostgles-types";
|
|
2
2
|
import type { TableConfig } from "../TableConfig/TableConfigTypes";
|
|
3
3
|
import { type ClientSchemaProfiles } from "./getClientDBGeneratedSchemas";
|
|
4
|
-
export declare const getDBGeneratedSchema: ({ config, tablesOrViews, clientSchemas, skipChecks, }: {
|
|
4
|
+
export declare const getDBGeneratedSchema: ({ config, tablesOrViews, clientSchemas, fileTableName, auditTableName, skipChecks, }: {
|
|
5
5
|
config: TableConfig | undefined;
|
|
6
6
|
tablesOrViews: TableSchema[];
|
|
7
7
|
clientSchemas?: ClientSchemaProfiles;
|
|
8
|
+
fileTableName?: string;
|
|
9
|
+
auditTableName?: string;
|
|
8
10
|
/** The initial DBO build precedes tableConfig migrations. */
|
|
9
11
|
skipChecks?: boolean;
|
|
10
12
|
}) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDBGeneratedSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"getDBGeneratedSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AASvC,eAAO,MAAM,oBAAoB,GAAI,sFAOlC;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,KAAG,MAmGH,CAAC"}
|
|
@@ -7,7 +7,9 @@ const constants_1 = require("./constants");
|
|
|
7
7
|
const getClientDBGeneratedSchemas_1 = require("./getClientDBGeneratedSchemas");
|
|
8
8
|
const getColumnTypescriptDefinition_1 = require("./getColumnTypescriptDefinition");
|
|
9
9
|
const getCheckedTableColumns_1 = require("./getCheckedTableColumns");
|
|
10
|
-
const
|
|
10
|
+
const uploadFile_1 = require("../DboBuilder/TableHandler/uploadFile");
|
|
11
|
+
const fileTableDefinitions_1 = require("../StorageClient/fileTableDefinitions");
|
|
12
|
+
const getDBGeneratedSchema = ({ config, tablesOrViews, clientSchemas, fileTableName, auditTableName, skipChecks = false, }) => {
|
|
11
13
|
const tables = [];
|
|
12
14
|
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
13
15
|
tablesOrViews
|
|
@@ -40,13 +42,21 @@ const getDBGeneratedSchema = ({ config, tablesOrViews, clientSchemas, skipChecks
|
|
|
40
42
|
.filter(prostgles_types_1.isDefined));
|
|
41
43
|
const referencedByStr = (0, prostgles_types_1.isEmpty)(referencedBy) ? "" : `referencedBy: ${JSON.stringify(referencedBy)};`;
|
|
42
44
|
const checkedColumns = skipChecks ? undefined : (0, getCheckedTableColumns_1.getCheckedTableColumns)(config, tableOrView, tablesOrViews);
|
|
45
|
+
const excludedFileColumns = tableOrView.name === fileTableName ?
|
|
46
|
+
cols.filter(({ name }) => (Object.hasOwn(fileTableDefinitions_1.FILE_TABLE_COLUMN_DEFINITIONS, name) ||
|
|
47
|
+
Object.hasOwn(fileTableDefinitions_1.FILE_TABLE_VERSION_COLUMN_DEFINITIONS, name)) &&
|
|
48
|
+
!uploadFile_1.FILE_SCHEMA_KEYS.some((key) => key === name))
|
|
49
|
+
: [];
|
|
50
|
+
const insertColumns = excludedFileColumns.length ?
|
|
51
|
+
`insertColumns: ${constants_1.DB_GENERATED_NAMES.SCHEMA}[${JSON.stringify(tableOrView.name)}]["columns"] extends infer Row ? Row extends unknown ? Omit<Row, ${excludedFileColumns.map(({ name }) => JSON.stringify(name)).join(" | ")}> & { ${excludedFileColumns.map(({ name }) => `${JSON.stringify(name)}?: never`).join("; ")} } : never : never;`
|
|
52
|
+
: "";
|
|
43
53
|
tables.push(`${(0, utils_1.escapeTSNames)(tableOrView.name)}: {
|
|
44
54
|
columns: ${checkedColumns ??
|
|
45
55
|
`{${cols
|
|
46
56
|
.map((column) => `
|
|
47
57
|
${(0, getColumnTypescriptDefinition_1.getColumnTypescriptDefinition)({ tablesOrViews, config, tableOrView, column })}`)
|
|
48
58
|
.join("")}
|
|
49
|
-
}`};
|
|
59
|
+
}`};${insertColumns ? `\n ${insertColumns}` : ""}${tableOrView.name === auditTableName ? "\n updateColumns: never;" : ""}
|
|
50
60
|
${referencedByStr}
|
|
51
61
|
};\n `);
|
|
52
62
|
});
|
|
@@ -78,7 +88,7 @@ export type ${constants_1.DB_GENERATED_NAMES.SCHEMA_OUTPUT} = {
|
|
|
78
88
|
* Data types as expected when inserting into the database (optional fields might be nullable/with defaults)
|
|
79
89
|
* */
|
|
80
90
|
export type ${constants_1.DB_GENERATED_NAMES.SCHEMA_INPUT} = {
|
|
81
|
-
[K in keyof ${constants_1.DB_GENERATED_NAMES.SCHEMA}]: ${constants_1.DB_GENERATED_NAMES.SCHEMA}[K]["columns"];
|
|
91
|
+
[K in keyof ${constants_1.DB_GENERATED_NAMES.SCHEMA}]: ${constants_1.DB_GENERATED_NAMES.SCHEMA}[K] extends { insertColumns: infer Input } ? Input : ${constants_1.DB_GENERATED_NAMES.SCHEMA}[K]["columns"];
|
|
82
92
|
};${clientSchemas ? "\n" + (0, getClientDBGeneratedSchemas_1.getClientDBGeneratedSchemas)(clientSchemas, tablesOrViews, config) : ""}
|
|
83
93
|
`;
|
|
84
94
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDBGeneratedSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAoF;AAEpF,0CAA+C;AAC/C,2CAAiD;AACjD,+EAGuC;AACvC,mFAAgF;AAChF,qEAAkE;
|
|
1
|
+
{"version":3,"file":"getDBGeneratedSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;AAI9D,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAG9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EACV,uBAAuB,EACvB,iBAAiB,EAEjB,gBAAgB,EAChB,WAAW,EACX,IAAI,EACL,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAStD,OAAO,EAAwB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAI7E,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAElC,qBAAa,UAAU;IACrB,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;IAC9B;;OAEG;IACH,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;IAE7B,EAAE,EAAE,EAAE,CAAC;IAEP;;;OAGG;IACH,GAAG,EAAE,uBAAuB,CAAC;IAE7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE9C;;OAEG;IACH,OAAO,CAAC,cAAc,CAAC,CAAgB;IAEvC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;IAEtD,gBAAgB,SAAM;IAEtB,aAAa,EAAE,aAAa,CAAC;IAE7B,OAAO;IASP,OAAO,CAAC,IAAI,CAQV;IAEF,IAAI,MAAM,IAAI,WAAW,EAAE,CAE1B;IAED,oBAAoB,GAAU,QAAQ,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;SAEhD;IAEF,uBAAuB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACjD,gBAAgB,QAAa,OAAO,CAAC,aAAa,CAAC,CA8BjD;IAEF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,OAAO,CAAC,iBAAiB,CAAiB;IAE1C,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAA6C;IAC5F,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAA6C;IAC9F,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6C;IACjF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyD;IAEhG,yBAAyB,GAAI,KAAK,MAAM;;;MAMtC;IAEF,2BAA2B,GAAI,UAAU,MAAM,EAAE,KAAK,MAAM,UAE1D;IAEF,eAAe,GAAI,aAAa,MAAM,EAAE,OAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,7 +127,9 @@ class DboBuilder {
|
|
|
127
127
|
this.transactionsByHandlers.set(handlers, this.getTransactionForHandlers(dbx));
|
|
128
128
|
};
|
|
129
129
|
failTransaction = (transaction, error) => {
|
|
130
|
-
this.transactionFailures.
|
|
130
|
+
if (!this.transactionFailures.has(transaction)) {
|
|
131
|
+
this.transactionFailures.set(transaction, { error });
|
|
132
|
+
}
|
|
131
133
|
};
|
|
132
134
|
registerOnRollbackCallback = (transaction, callback) => {
|
|
133
135
|
const callbacks = this.onRollbackCallbacksByTransaction.get(transaction);
|
|
@@ -287,6 +289,8 @@ class DboBuilder {
|
|
|
287
289
|
}
|
|
288
290
|
this.tableTsDefinitions = (0, getDBGeneratedSchema_1.getDBGeneratedSchema)({
|
|
289
291
|
config: this.prostgles.mergedTableConfig.tableConfig,
|
|
292
|
+
fileTableName: this.prostgles.opts.fileTable?.tableName,
|
|
293
|
+
auditTableName: this.prostgles.opts.audit?.tableName,
|
|
290
294
|
tablesOrViews,
|
|
291
295
|
skipChecks: this.prostgles.preparingTableConfig,
|
|
292
296
|
});
|
|
@@ -304,6 +308,8 @@ class DboBuilder {
|
|
|
304
308
|
const getSchema = (tablesOrViews) => {
|
|
305
309
|
const tableTsDefinitions = (0, getDBGeneratedSchema_1.getDBGeneratedSchema)({
|
|
306
310
|
config: this.prostgles.mergedTableConfig.tableConfig,
|
|
311
|
+
fileTableName: this.prostgles.opts.fileTable?.tableName,
|
|
312
|
+
auditTableName: this.prostgles.opts.audit?.tableName,
|
|
307
313
|
clientSchemas,
|
|
308
314
|
tablesOrViews: [
|
|
309
315
|
...tablesOrViews,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ARRAY_SEARCH.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,eAAO,MAAM,YAAY,EAAE,YAiE1B,CAAC"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ARRAY_SEARCH = void 0;
|
|
7
|
+
const pg_promise_1 = __importDefault(require("pg-promise"));
|
|
8
|
+
const asNameAlias_1 = require("../../../utils/asNameAlias");
|
|
9
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
10
|
+
const pgp = (0, pg_promise_1.default)();
|
|
11
|
+
exports.ARRAY_SEARCH = {
|
|
12
|
+
name: "$array_search",
|
|
13
|
+
type: "function",
|
|
14
|
+
description: `:[column_name, search_term, opts?: { matchCase?: boolean, contextChars?: number, limit?: number }] -> Search a text array for non-overlapping literal matches. Returns [{ index, offset, match, snippet }] in page/offset order. Index is the PostgreSQL array index (normally 1-based); offset is a 0-based character offset within that page, not a UTF-16 offset. Defaults: matchCase=false, contextChars=80 on each side, limit=20 per row. No matches or a null array returns [].`,
|
|
15
|
+
numArgs: 3,
|
|
16
|
+
singleColArg: false,
|
|
17
|
+
returnType: "jsonb",
|
|
18
|
+
getFields: ([columnName]) => [columnName],
|
|
19
|
+
getQuery: ({ args: [columnName, searchTerm, options = {}], tableAliasRaw, allColumns }) => {
|
|
20
|
+
if (typeof searchTerm !== "string" || !searchTerm.length) {
|
|
21
|
+
throw new Error("$array_search search_term must be a non-empty string");
|
|
22
|
+
}
|
|
23
|
+
if (!options || !(0, prostgles_types_1.isObject)(options)) {
|
|
24
|
+
throw new Error("$array_search options must be an object");
|
|
25
|
+
}
|
|
26
|
+
if (Object.keys(options).some((key) => !["matchCase", "contextChars", "limit"].includes(key))) {
|
|
27
|
+
throw new Error("$array_search options must be matchCase, contextChars or limit");
|
|
28
|
+
}
|
|
29
|
+
const { matchCase = false, contextChars = 80, limit = 20 } = options;
|
|
30
|
+
if (typeof matchCase !== "boolean") {
|
|
31
|
+
throw new Error("$array_search matchCase must be a boolean");
|
|
32
|
+
}
|
|
33
|
+
if (!Number.isInteger(contextChars) || contextChars < 0 || contextChars > 10000) {
|
|
34
|
+
throw new Error("$array_search contextChars must be an integer between 0 and 10000");
|
|
35
|
+
}
|
|
36
|
+
if (!Number.isInteger(limit) || limit < 1 || limit > 1000) {
|
|
37
|
+
throw new Error("$array_search limit must be an integer between 1 and 1000");
|
|
38
|
+
}
|
|
39
|
+
const columnInfo = allColumns.find((col) => col.name === columnName);
|
|
40
|
+
if (columnInfo?.udt_name !== "_text") {
|
|
41
|
+
throw new Error("$array_search can only be used on text arrays");
|
|
42
|
+
}
|
|
43
|
+
const column = (0, asNameAlias_1.asNameAlias)(columnName, tableAliasRaw);
|
|
44
|
+
const term = pgp.as.format("$1::text", [searchTerm]);
|
|
45
|
+
// The q flag treats the entire search term literally, including regex metacharacters.
|
|
46
|
+
const flags = matchCase ? "q" : "iq";
|
|
47
|
+
return `(
|
|
48
|
+
SELECT COALESCE(jsonb_agg(matches.result ORDER BY matches.page_index, matches.match_offset), '[]'::jsonb)
|
|
49
|
+
FROM (
|
|
50
|
+
SELECT
|
|
51
|
+
page_index,
|
|
52
|
+
match_offset,
|
|
53
|
+
jsonb_build_object(
|
|
54
|
+
'index', page_index,
|
|
55
|
+
'offset', match_offset,
|
|
56
|
+
'match', substr(pages[page_index], match_offset + 1, length(${term})),
|
|
57
|
+
'snippet', substr(pages[page_index], greatest(1, match_offset + 1 - ${contextChars}),
|
|
58
|
+
least(match_offset, ${contextChars}) + length(${term}) + ${contextChars})
|
|
59
|
+
) AS result
|
|
60
|
+
FROM (SELECT ${column} AS pages) AS source
|
|
61
|
+
CROSS JOIN LATERAL generate_subscripts(pages, 1) AS page(page_index)
|
|
62
|
+
CROSS JOIN LATERAL (
|
|
63
|
+
SELECT (sum(length(part) + length(${term})) OVER (ORDER BY part_index)
|
|
64
|
+
- length(${term}))::integer AS match_offset,
|
|
65
|
+
lead(part_index) OVER (ORDER BY part_index) AS next_part
|
|
66
|
+
FROM regexp_split_to_table(pages[page_index], ${term}, '${flags}')
|
|
67
|
+
WITH ORDINALITY AS parts(part, part_index)
|
|
68
|
+
) AS offsets
|
|
69
|
+
WHERE next_part IS NOT NULL
|
|
70
|
+
ORDER BY page_index, match_offset
|
|
71
|
+
LIMIT ${limit}
|
|
72
|
+
) AS matches
|
|
73
|
+
)`;
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
//# sourceMappingURL=ARRAY_SEARCH.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ARRAY_SEARCH.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/ARRAY_SEARCH.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AACnC,4DAAyD;AAEzD,qDAA2C;AAE3C,MAAM,GAAG,GAAG,IAAA,oBAAS,GAAE,CAAC;AAEX,QAAA,YAAY,GAAiB;IACxC,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,wdAAwd;IACre,OAAO,EAAE,CAAC;IACV,YAAY,EAAE,KAAK;IACnB,UAAU,EAAE,OAAO;IACnB,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC;IACzC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;QACxF,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,0BAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC9F,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,YAAY,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QACrE,IAAI,OAAO,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,CAAC,IAAI,YAAY,GAAG,KAAK,EAAE,CAAC;YAChF,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACrE,IAAI,UAAU,EAAE,QAAQ,KAAM,OAAkB,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACrD,sFAAsF;QACtF,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,OAAO;;;;;;;;;0EAS+D,IAAI;kFACI,YAAY;oCAC1D,YAAY,cAAc,IAAI,OAAO,YAAY;;uBAE9D,MAAM;;;8CAGiB,IAAI;uBAC3B,IAAI;;0DAE+B,IAAI,MAAM,KAAK;;;;;gBAKzD,KAAK;;MAEf,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Functions.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/Functions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Functions.d.ts","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/Functions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAO3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGhE,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACxC;;OAEG;IACH,QAAQ,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAExC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;OAEG;IAGH;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,UAAU,CAAC;IAC9C;;;OAGG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,MAAM,EAAE,CAAC;IAC3C;;OAEG;IACH,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,MAAM,CAAC;IAE3C,UAAU,CAAC,EAAE,uBAAuB,CAAC;CACtC,CAAC;AAuaF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,YAAY,EA0VnC,CAAC"}
|
|
@@ -9,6 +9,7 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
9
9
|
const asNameAlias_1 = require("../../../utils/asNameAlias");
|
|
10
10
|
const HASHING_FUNCTIONS_1 = require("./HASHING_FUNCTIONS");
|
|
11
11
|
const TEXT_FUNCTIONS_1 = require("./TEXT_FUNCTIONS");
|
|
12
|
+
const ARRAY_SEARCH_1 = require("./ARRAY_SEARCH");
|
|
12
13
|
const utils_1 = require("./utils");
|
|
13
14
|
const pgp = (0, pg_promise_1.default)();
|
|
14
15
|
const asValue = (v, castAs = "") => pgp.as.format("$1" + castAs, [v]);
|
|
@@ -581,7 +582,7 @@ exports.FUNCTIONS = [
|
|
|
581
582
|
numArgs: 1,
|
|
582
583
|
singleColArg: false,
|
|
583
584
|
getFields: (args) => [args[1]],
|
|
584
|
-
getQuery: ({
|
|
585
|
+
getQuery: ({ args, tableAliasRaw: tableAlias }) => {
|
|
585
586
|
const value = asValue(args[0]) + "", seedColumnName = (0, asNameAlias_1.asNameAlias)(args[1], tableAlias);
|
|
586
587
|
return `crypt(${value}, ${seedColumnName}::text)`;
|
|
587
588
|
},
|
|
@@ -600,6 +601,7 @@ exports.FUNCTIONS = [
|
|
|
600
601
|
return `${(0, asNameAlias_1.asNameAlias)(columnName, tableAlias)}[${asValue(index)}]`;
|
|
601
602
|
},
|
|
602
603
|
}),
|
|
604
|
+
ARRAY_SEARCH_1.ARRAY_SEARCH,
|
|
603
605
|
/* Aggs */
|
|
604
606
|
...["max", "min", "count", "avg", "json_agg", "jsonb_agg", "string_agg", "array_agg", "sum"].map((aggName) => (0, utils_1.asFunction)({
|
|
605
607
|
name: "$" + aggName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Functions.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/Functions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Functions.js","sourceRoot":"","sources":["../../../../lib/DboBuilder/QueryBuilder/Functions/Functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ type Args = Pick<UploadFileArgs, "localParams" | "data" | "original_name" | "ori
|
|
|
8
8
|
filter: AnyObject;
|
|
9
9
|
};
|
|
10
10
|
export declare const updateFile: (tableHandler: TableHandler, config: FileTableConfig, { filter, data, original_name, original_last_modified, localParams, onCommit, onRollback }: Args) => Promise<{
|
|
11
|
-
newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "id">;
|
|
11
|
+
newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "description" | "id">;
|
|
12
12
|
}>;
|
|
13
13
|
export declare const lockFileForUpdate: (tableHandler: TableHandler, filter: AnyObject, permittedWhere: string, localParams: LocalParams | undefined) => Promise<boolean>;
|
|
14
14
|
export {};
|
|
@@ -22,7 +22,7 @@ const updateFile = async (tableHandler, config, { filter, data, original_name, o
|
|
|
22
22
|
version: Number(existingFile.version ?? 1) + 1,
|
|
23
23
|
original_last_modified,
|
|
24
24
|
});
|
|
25
|
-
return { newData: (0, prostgles_types_1.omitKeys)(newFile, ["id"]) };
|
|
25
|
+
return { newData: (0, prostgles_types_1.omitKeys)(newFile, ["id", "description"]) };
|
|
26
26
|
};
|
|
27
27
|
exports.updateFile = updateFile;
|
|
28
28
|
const lockFileForUpdate = async (tableHandler, filter, permittedWhere, localParams) => {
|
|
@@ -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;
|
|
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,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,YAA0B,EAC1B,MAAiB,EACjB,cAAsB,EACtB,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,sFAAsF;IACtF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACvC,IAAA,wBAAW,EACT,WAAW,EACX,iBAAiB,YAAY,CAAC,WAAW,IAAI,cAAc,aAAa,EACxE,IAAI,CACL,CACF,CAAC;IACF,OAAO,CAAC,CAAC,GAAG,CAAC;AACf,CAAC,CAAC;AAlBW,QAAA,iBAAiB,qBAkB5B;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"}
|
|
@@ -31,7 +31,7 @@ declare const FILE_SCHEMA: {
|
|
|
31
31
|
}];
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
|
-
export declare const FILE_SCHEMA_KEYS: ("data" | "id" | "original_name" | "original_last_modified")[];
|
|
34
|
+
export declare const FILE_SCHEMA_KEYS: readonly [...("data" | "id" | "original_name" | "original_last_modified")[], "description"];
|
|
35
35
|
type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
|
|
36
36
|
export declare const assertFileObjectValid: AssertFileObjectValid;
|
|
37
37
|
export type UploadFileArgs = TransactionCallbacks & {
|
|
@@ -1 +1 @@
|
|
|
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;AAK3E,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,
|
|
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;AAK3E,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,6FAAoD,CAAC;AAElF,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,CAsE5E,CAAC"}
|
|
@@ -13,7 +13,7 @@ const FILE_SCHEMA = {
|
|
|
13
13
|
original_last_modified: { type: "string", optional: true },
|
|
14
14
|
data: getFileBuffer_1.FILE_DATA_SCHEMA,
|
|
15
15
|
};
|
|
16
|
-
exports.FILE_SCHEMA_KEYS = (0, prostgles_types_1.getKeys)(FILE_SCHEMA);
|
|
16
|
+
exports.FILE_SCHEMA_KEYS = [...(0, prostgles_types_1.getKeys)(FILE_SCHEMA), "description"];
|
|
17
17
|
const assertFileObjectValid = (row) => {
|
|
18
18
|
const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)(FILE_SCHEMA, row, "file upload", undefined, {
|
|
19
19
|
allowExtraProperties: false,
|
|
@@ -69,6 +69,7 @@ const uploadFile = async (config, { data, original_name, original_last_modified,
|
|
|
69
69
|
...coreInfo,
|
|
70
70
|
original_last_modified,
|
|
71
71
|
cloud_url: url ?? "",
|
|
72
|
+
local_file_path: filePath ?? null,
|
|
72
73
|
etag: contentHash,
|
|
73
74
|
extension: type.ext,
|
|
74
75
|
url: [fileServeRoute, coreInfo.id].join("/"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,qDAA2F;AAG3F,mFAAgF;AAChF,qFAA8E;AAC9E,uFAAoF;AACpF,mDAAmD;AAOnD,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,aAAa,EAAE,QAAQ;IACvB,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC1D,IAAI,EAAE,gCAAgB;CACd,CAAC;AAEE,QAAA,gBAAgB,GAAG,IAAA,yBAAO,EAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,qDAA2F;AAG3F,mFAAgF;AAChF,qFAA8E;AAC9E,uFAAoF;AACpF,mDAAmD;AAOnD,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,aAAa,EAAE,QAAQ;IACvB,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC1D,IAAI,EAAE,gCAAgB;CACd,CAAC;AAEE,QAAA,gBAAgB,GAAG,CAAC,GAAG,IAAA,yBAAO,EAAC,WAAW,CAAC,EAAE,aAAa,CAAU,CAAC;AAI3E,MAAM,qBAAqB,GAA0B,CAAC,GAAG,EAAE,EAAE;IAClE,MAAM,UAAU,GAAG,IAAA,qDAAmC,EACpD,WAAW,EACX,GAAG,EACH,aAAa,EACb,SAAS,EACT;QACE,oBAAoB,EAAE,KAAK;KAC5B,CACF,CAAC;IACF,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC;AAcK,MAAM,UAAU,GAAG,KAAK,EAC7B,MAAuB,EACvB,EACE,IAAI,EACJ,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,OAAO,EACP,OAAO,EACP,QAAQ,EACR,UAAU,GACK,EAC4D,EAAE;IAC/E,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAE3C,MAAM,QAAQ,GAAG,OAAO,IAAI,IAAA,mBAAU,GAAE,CAAC;IACzC,MAAM,YAAY,GAAG,WAAW,EAAE,YAAY,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE;QAC9C,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,YAAY,EAAE,aAAa;QACtC,OAAO,EAAE,YAAY,EAAE,iBAAiB;KACzC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAU,CAAC;IACvF,MAAM,QAAQ,GAAoE;QAChF,EAAE,EAAE,QAAQ;QACZ,aAAa;QACb,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,YAAY,EAAE,IAAI,CAAC,IAAI;KACxB,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,mBAAU,GAAE,CAAC;IAChC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CACtD,aAAa,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,QAAQ,CAAC,YAAY;KACnC,CAAC,CACH,CAAC;IACF,MAAM,OAAO,GAAqB,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;QACjD,2EAA2E;QAC3E,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACpC,MAAM,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,UAAU,CAAC,OAAO,CAAC,CAAC;IACpB,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAElE,MAAM,cAAc,GAAG,IAAA,yCAAiB,EAAC,MAAM,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAgC;QAC5C,WAAW,EAAE,UAAU;QACvB,UAAU,EAAE,IAAI;QAChB,kBAAkB,EAAE,IAAI;QACxB,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACjC,OAAO,EAAE,IAAI;QACb,oBAAoB,EAAE,IAAI;QAC1B,WAAW,EAAE,EAAE;QACf,GAAG,QAAQ;QACX,sBAAsB;QACtB,SAAS,EAAE,GAAG,IAAI,EAAE;QACpB,eAAe,EAAE,QAAQ,IAAI,IAAI;QACjC,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,GAAG,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC5C,cAAc,EAAE,MAAM,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC;IAE1B,OAAO,QAAQ,CAAC,CAAC;QACb;YACE,GAAG,QAAQ;YACX,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAChC;QACH,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC,CAAC;AAlFW,QAAA,UAAU,cAkFrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumns.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI7D,eAAO,MAAM,cAAc,GAAI,GAAG,GAAG,KAAG,CAAC,IAAI,YAAuC,CAAC;AAErF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EAC9C,OAAO,CAAC,EAAE,SAAS,EACnB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwChC;AAED,sEAAsE;AACtE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EAC9C,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"getColumns.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI7D,eAAO,MAAM,cAAc,GAAI,GAAG,GAAG,KAAG,CAAC,IAAI,YAAuC,CAAC;AAErF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EAC9C,OAAO,CAAC,EAAE,SAAS,EACnB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwChC;AAED,sEAAsE;AACtE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,EAC9C,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwFhC"}
|
|
@@ -77,16 +77,12 @@ async function getRawColumns(lang, params, tableRules, localParams) {
|
|
|
77
77
|
const select = !!c.privileges.SELECT;
|
|
78
78
|
const insert = !!c.privileges.INSERT;
|
|
79
79
|
const _delete = !!this.tableOrViewInfo.privileges.delete;
|
|
80
|
-
|
|
80
|
+
const update = !!c.privileges.UPDATE;
|
|
81
81
|
const prostgles = this.dboBuilder.prostgles;
|
|
82
82
|
const fileConfig = getFileColumnInfo({
|
|
83
83
|
colName: c.name,
|
|
84
84
|
tableHandler: this,
|
|
85
85
|
});
|
|
86
|
-
/** Do not allow updates to file table unless it's to delete fields */
|
|
87
|
-
if (prostgles.opts.fileTable?.tableName === this.name) {
|
|
88
|
-
update = false;
|
|
89
|
-
}
|
|
90
86
|
const nonOrderableUD_Types = [...prostgles_types_1._PG_geometric, "xml"];
|
|
91
87
|
const result = {
|
|
92
88
|
...(0, prostgles_types_1.omitKeys)(c, ["privileges"]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":";;;AAYA,gCA+CC;AAGD,
|
|
1
|
+
{"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare const FILE_TABLE_COLUMN_DEFINITIONS: {
|
|
|
14
14
|
readonly description: "TEXT";
|
|
15
15
|
readonly url: "TEXT NOT NULL DEFAULT ''";
|
|
16
16
|
readonly cloud_url: "TEXT";
|
|
17
|
+
readonly local_file_path: "TEXT";
|
|
17
18
|
readonly signed_url: "TEXT";
|
|
18
19
|
readonly signed_url_expires: "BIGINT";
|
|
19
20
|
readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
|
|
@@ -40,6 +41,7 @@ export declare const FILE_VERSION_TABLE_COLUMN_DEFINITIONS: {
|
|
|
40
41
|
readonly original_name: "TEXT NOT NULL";
|
|
41
42
|
readonly original_last_modified: "TIMESTAMPTZ";
|
|
42
43
|
readonly cloud_url: "TEXT";
|
|
44
|
+
readonly local_file_path: "TEXT";
|
|
43
45
|
readonly signed_url: "TEXT";
|
|
44
46
|
readonly signed_url_expires: "BIGINT";
|
|
45
47
|
readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileTableDefinitions.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/fileTableDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAElG,eAAO,MAAM,6BAA6B;;IAExC;;SAEK
|
|
1
|
+
{"version":3,"file":"fileTableDefinitions.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/fileTableDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAElG,eAAO,MAAM,6BAA6B;;IAExC;;SAEK;;;;;;;;;;;;;;;;;;;CAmBG,CAAC;AAEX,eAAO,MAAM,qCAAqC;;CAExC,CAAC;AAEX,eAAO,MAAM,qCAAqC;;;;;;;;;;;;;;;;;;;;;;CAMxC,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,6BAA6B,CAC5D,OAAO,6BAA6B,CACrC,GACC,OAAO,CAAC,6BAA6B,CAAC,OAAO,qCAAqC,CAAC,CAAC,CAAC;AACvF,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,6BAA6B,CAAC,OAAO,6BAA6B,CAAC,CACpE,GACC,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,OAAO,qCAAqC,CAAC,CAAC,CAAC,CAAC;AAEjG,MAAM,MAAM,yBAAyB,GAAG,6BAA6B,CACnE,OAAO,qCAAqC,CAC7C,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileTableDefinitions.js","sourceRoot":"","sources":["../../lib/StorageClient/fileTableDefinitions.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAG9B,QAAA,6BAA6B,GAAG;IAC3C,EAAE,EAAE,4CAA4C;IAChD;;SAEK;IACL,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,0BAA0B;IACrC,YAAY,EAAE,0BAA0B;IACxC,cAAc,EAAE,2BAA2B;IAC3C,IAAI,EAAE,0BAA0B;IAChC,aAAa,EAAE,eAAe;IAC9B,sBAAsB,EAAE,aAAa;IACrC,WAAW,EAAE,MAAM;IACnB,GAAG,EAAE,0BAA0B;IAC/B,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,kBAAkB,EAAE,QAAQ;IAC5B,KAAK,EAAE,kCAAkC;IACzC,OAAO,EAAE,kCAAkC;IAC3C,OAAO,EAAE,aAAa;IACtB,oBAAoB,EAAE,aAAa;IACnC,IAAI,EAAE,mDAAmD,EAAE,8HAA8H;CACjL,CAAC;AAEE,QAAA,qCAAqC,GAAG;IACnD,OAAO,EAAE,4BAA4B;CAC7B,CAAC;AAEE,QAAA,qCAAqC,GAAG;IACnD,GAAG,IAAA,0BAAQ,EAAC,qCAA6B,EAAE,CAAC,MAAM,CAAC,CAAC;IACpD,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,eAAe,EAAE,kCAAkC;IAC5D,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,kCAAkC;CACnC,CAAC"}
|
|
1
|
+
{"version":3,"file":"fileTableDefinitions.js","sourceRoot":"","sources":["../../lib/StorageClient/fileTableDefinitions.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAG9B,QAAA,6BAA6B,GAAG;IAC3C,EAAE,EAAE,4CAA4C;IAChD;;SAEK;IACL,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,0BAA0B;IACrC,YAAY,EAAE,0BAA0B;IACxC,cAAc,EAAE,2BAA2B;IAC3C,IAAI,EAAE,0BAA0B;IAChC,aAAa,EAAE,eAAe;IAC9B,sBAAsB,EAAE,aAAa;IACrC,WAAW,EAAE,MAAM;IACnB,GAAG,EAAE,0BAA0B;IAC/B,SAAS,EAAE,MAAM;IACjB,eAAe,EAAE,MAAM;IACvB,UAAU,EAAE,MAAM;IAClB,kBAAkB,EAAE,QAAQ;IAC5B,KAAK,EAAE,kCAAkC;IACzC,OAAO,EAAE,kCAAkC;IAC3C,OAAO,EAAE,aAAa;IACtB,oBAAoB,EAAE,aAAa;IACnC,IAAI,EAAE,mDAAmD,EAAE,8HAA8H;CACjL,CAAC;AAEE,QAAA,qCAAqC,GAAG;IACnD,OAAO,EAAE,4BAA4B;CAC7B,CAAC;AAEE,QAAA,qCAAqC,GAAG;IACnD,GAAG,IAAA,0BAAQ,EAAC,qCAA6B,EAAE,CAAC,MAAM,CAAC,CAAC;IACpD,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,eAAe,EAAE,kCAAkC;IAC5D,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,kCAAkC;CACnC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableConfig.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"AAMA,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":"AAMA,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;CAwNvF,CAAC"}
|
|
@@ -37,7 +37,7 @@ const getFileTableConfig = (prg) => {
|
|
|
37
37
|
...fileTableDefinitions_1.FILE_TABLE_COLUMN_DEFINITIONS,
|
|
38
38
|
...(fileTable.versioning && fileTableDefinitions_1.FILE_TABLE_VERSION_COLUMN_DEFINITIONS),
|
|
39
39
|
};
|
|
40
|
-
const fileColumnDefinitionsColumnNames = (0, prostgles_types_1.getKeys)(fileColumnDefinitions);
|
|
40
|
+
const fileColumnDefinitionsColumnNames = (0, prostgles_types_1.getKeys)(fileColumnDefinitions).filter((column) => column !== "description");
|
|
41
41
|
const userFileTableConfig = tableConfig?.[fileTableName];
|
|
42
42
|
if (userFileTableConfig) {
|
|
43
43
|
if ("isLookupTable" in userFileTableConfig) {
|
|
@@ -112,7 +112,7 @@ const getFileTableConfig = (prg) => {
|
|
|
112
112
|
const fileData = (0, prostgles_types_1.pickKeys)(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
113
113
|
/**
|
|
114
114
|
* File table config can be extended with extra columns.
|
|
115
|
-
* Allow
|
|
115
|
+
* Allow description and custom column updates without affecting the core file data.
|
|
116
116
|
*/
|
|
117
117
|
const extraData = (0, prostgles_types_1.omitKeys)(insertOrUpdateData, fileColumnDefinitionsColumnNames);
|
|
118
118
|
if (command === "update" && (0, prostgles_types_1.isEmpty)(fileData)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":";;;AAAA,qDAA+E;AAC/E,kDAA+C;AAC/C,4FAAyF;AACzF,sEAAmE;AACnE,sEAA0F;AAC1F,4EAAyE;AAQzE,mEAAgE;AAEhE,yDAAkF;AAClF,uDAA0E;AAC1E,iEAKgC;AAIzB,MAAM,kBAAkB,GAAG,CAChC,GAAc,EAC2E,EAAE;IAC3F,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IACxD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;IACrC,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IAEjC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAC9D,MAAM,gBAAgB,GAAG,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,0BAA0B,IAAA,SAAG,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACjH,MAAM,gBAAgB,GAAG,0BAA0B,IAAA,SAAG,EAAC,gBAAgB,CAAC,MAAM,CAAC;IAC/E,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QACzB,IAAI,gBAAgB,KAAK,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAClF,CAAC;QACD,IACE,SAAS,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS;YAC9C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,EAC7F,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,WAAW,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,4BAA4B,gBAAgB,sDAAsD,CACnG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,qBAAqB,GAAG;QAC5B,GAAG,oDAA6B;QAChC,GAAG,CAAC,SAAS,CAAC,UAAU,IAAI,4DAAqC,CAAC;KACnE,CAAC;IACF,MAAM,gCAAgC,GAAG,IAAA,yBAAO,EAAC,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,11 @@ import type { PermissionScope } from "../PublishParser/publishTypesAndUtils";
|
|
|
6
6
|
export type ClientHandlers<S = void> = {
|
|
7
7
|
clientSql: SQLHandler;
|
|
8
8
|
clientDb: DBHandlerServerRestricted<S>;
|
|
9
|
+
/**
|
|
10
|
+
* Bind permission-checked table handlers to an active transaction from this instance.
|
|
11
|
+
* The caller owns the transaction; caught request errors still roll it back.
|
|
12
|
+
*/
|
|
13
|
+
getClientDbForTransaction: (transactionDb: DBHandlerServerRestricted<S>) => DBHandlerServerRestricted<S>;
|
|
9
14
|
/**
|
|
10
15
|
* Runs permission-checked table operations in a transaction. Requires transactions: true.
|
|
11
16
|
* Caught table request errors also roll back the transaction.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientHandlers.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EAGhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAI7E,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,IAAI,IAAI;IACrC,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACvC;;;OAGG;IACH,cAAc,EAAE,CAAC,CAAC,EAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACjE,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,aAAa,EAAE,qBAAqB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,iBAAiB,GACjB;IACE,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,GAAG,CAAC,EAAE,KAAK,CAAC;CACb,CAAC;AAEN,MAAM,MAAM,mBAAmB,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,oBAAoB,GAAG,YAAY,EACzF,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,eAAe,GAAG,SAAS,KAC/B,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAEnD,eAAO,MAAM,mBAAmB,GAAU,YAAY,GAAG,IAAI,EAC3D,WAAW,SAAS,EACpB,WAAW,sBAAsB,EACjC,OAAO,eAAe,GAAG,SAAS,0CAanC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,CAAC,GAAG,IAAI,EAC9C,WAAW,SAAS,EACpB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,KACjC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getClientHandlers.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EAGhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAI7E,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,IAAI,IAAI;IACrC,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACvC;;;OAGG;IACH,yBAAyB,EAAE,CACzB,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC,KACxC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAClC;;;OAGG;IACH,cAAc,EAAE,CAAC,CAAC,EAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACjE,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,aAAa,EAAE,qBAAqB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,iBAAiB,GACjB;IACE,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,GAAG,CAAC,EAAE,KAAK,CAAC;CACb,CAAC;AAEN,MAAM,MAAM,mBAAmB,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,oBAAoB,GAAG,YAAY,EACzF,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,eAAe,GAAG,SAAS,KAC/B,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAEnD,eAAO,MAAM,mBAAmB,GAAU,YAAY,GAAG,IAAI,EAC3D,WAAW,SAAS,EACpB,WAAW,sBAAsB,EACjC,OAAO,eAAe,GAAG,SAAS,0CAanC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,CAAC,GAAG,IAAI,EAC9C,WAAW,SAAS,EACpB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,KACjC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CA+F3B,CAAC"}
|
|
@@ -24,12 +24,17 @@ const getClientHandlers = async (prostgles, clientReq, scope) => {
|
|
|
24
24
|
const allowedMethods = (0, prostgles_types_1.getAllowedTableMethods)(table);
|
|
25
25
|
const methods = tableMethods.filter((command) => allowedMethods.includes(command));
|
|
26
26
|
const handlers = Object.fromEntries(methods.map((command) => {
|
|
27
|
-
const method = (param1, param2, param3) =>
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
const method = async (param1, param2, param3) => {
|
|
28
|
+
if (transactionHandlers) {
|
|
29
|
+
prostgles.dboBuilder.getTransactionForHandlers(transactionHandlers);
|
|
30
|
+
}
|
|
31
|
+
return runClientRequest_1.runClientRequest
|
|
32
|
+
.bind(prostgles)({ command, tableName: table.name, param1, param2, param3 }, clientReq, scope, transactionHandlers)
|
|
33
|
+
.catch((error) => {
|
|
34
|
+
onRequestError?.(error);
|
|
35
|
+
throw error;
|
|
36
|
+
});
|
|
37
|
+
};
|
|
33
38
|
return [command, method];
|
|
34
39
|
}));
|
|
35
40
|
return [table.name, handlers];
|
|
@@ -41,26 +46,21 @@ const getClientHandlers = async (prostgles, clientReq, scope) => {
|
|
|
41
46
|
return sqlHandler(query, params, options);
|
|
42
47
|
});
|
|
43
48
|
const clientDb = getTableHandlers();
|
|
49
|
+
const getClientDbForTransaction = (transactionDb) => {
|
|
50
|
+
prostgles.checkNotDestroyed();
|
|
51
|
+
const transaction = prostgles.dboBuilder.getTransactionForHandlers(transactionDb);
|
|
52
|
+
const handlers = getTableHandlers(transaction.dbTX, (error) => {
|
|
53
|
+
prostgles.dboBuilder.failTransaction(transaction.t, error);
|
|
54
|
+
});
|
|
55
|
+
prostgles.dboBuilder.registerTransactionHandlers(handlers, transaction.dbTX);
|
|
56
|
+
return handlers;
|
|
57
|
+
};
|
|
44
58
|
const withClientDbTx = async (callback) => {
|
|
45
59
|
prostgles.checkNotDestroyed();
|
|
46
60
|
if (!prostgles.opts.transactions) {
|
|
47
61
|
throw new Error("Transactions are not enabled");
|
|
48
62
|
}
|
|
49
|
-
return prostgles.dboBuilder.getTX(
|
|
50
|
-
/**
|
|
51
|
-
* runClientRequest throws authorization errors.
|
|
52
|
-
* Prevent cached authorization errors from committing the transaction.
|
|
53
|
-
*/
|
|
54
|
-
let failure;
|
|
55
|
-
const clientDb = getTableHandlers(transactionHandlers, (error) => {
|
|
56
|
-
failure ??= { error };
|
|
57
|
-
});
|
|
58
|
-
prostgles.dboBuilder.registerTransactionHandlers(clientDb, transactionHandlers);
|
|
59
|
-
const result = await callback(clientDb);
|
|
60
|
-
if (failure)
|
|
61
|
-
throw failure.error;
|
|
62
|
-
return result;
|
|
63
|
-
});
|
|
63
|
+
return prostgles.dboBuilder.getTX((transactionHandlers) => callback(getClientDbForTransaction(transactionHandlers)));
|
|
64
64
|
};
|
|
65
65
|
const clientMethods = Object.fromEntries(clientSchema.methods.map(({ name, ...metadata }) => {
|
|
66
66
|
const methodHandler = (input) => {
|
|
@@ -71,7 +71,14 @@ const getClientHandlers = async (prostgles, clientReq, scope) => {
|
|
|
71
71
|
};
|
|
72
72
|
return [name, { name, ...metadata, run: methodHandler }];
|
|
73
73
|
}));
|
|
74
|
-
return {
|
|
74
|
+
return {
|
|
75
|
+
clientDb,
|
|
76
|
+
clientSql,
|
|
77
|
+
clientMethods,
|
|
78
|
+
clientSchema,
|
|
79
|
+
withClientDbTx,
|
|
80
|
+
getClientDbForTransaction,
|
|
81
|
+
};
|
|
75
82
|
};
|
|
76
83
|
exports.getClientHandlers = getClientHandlers;
|
|
77
84
|
const tableMethods = (0, prostgles_types_1.getKeys)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":";;;AAAA,qDASyB;AAEzB,uEAA0E;AAK1E,0DAA6F;AAC7F,uDAAoD;
|
|
1
|
+
{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.667",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"pg": "^8.23.1",
|
|
62
62
|
"pg-cursor": "^2.22.1",
|
|
63
63
|
"pg-promise": "^12.7.1",
|
|
64
|
-
"prostgles-types": "^4.0.
|
|
64
|
+
"prostgles-types": "^4.0.302"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@eslint/js": "^9.22.0",
|