prostgles-server 4.2.628 → 4.2.629
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/Audit/getAuditTableRules.js +4 -4
- package/dist/Audit/getAuditTableRules.js.map +1 -1
- package/dist/PublishParser/getPublishSchemas.d.ts.map +1 -1
- package/dist/PublishParser/getPublishSchemas.js +1 -1
- package/dist/PublishParser/getPublishSchemas.js.map +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.d.ts +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.d.ts.map +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.js +8 -6
- package/dist/PublishParser/getPublishedObjectFromResult.js.map +1 -1
- package/lib/Audit/getAuditTableRules.ts +5 -5
- package/lib/PublishParser/getPublishSchemas.ts +1 -0
- package/lib/PublishParser/getPublishedObjectFromResult.ts +11 -5
- package/package.json +1 -1
|
@@ -13,9 +13,9 @@ const getAuditTableRules = async function (audit, auditTablePublishRules, client
|
|
|
13
13
|
if (resolvedPublishObject && Object.hasOwn(resolvedPublishObject, audit.tableName)) {
|
|
14
14
|
return auditTablePublishRules;
|
|
15
15
|
}
|
|
16
|
-
const
|
|
16
|
+
const auditedTableEntries = Object.entries(audit.tables).filter(([tableName]) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media);
|
|
17
17
|
const auditTableHandler = this.dbo[audit.tableName];
|
|
18
|
-
const auditedTableRules = (await Promise.all(
|
|
18
|
+
const auditedTableRules = (await Promise.all(auditedTableEntries.map(async ([tableName, { idColumns, excludeColumns }]) => {
|
|
19
19
|
const tableHandler = this.dbo[tableName];
|
|
20
20
|
if (!tableHandler)
|
|
21
21
|
return;
|
|
@@ -31,8 +31,8 @@ const getAuditTableRules = async function (audit, auditTablePublishRules, client
|
|
|
31
31
|
}
|
|
32
32
|
return {
|
|
33
33
|
handler: tableHandler,
|
|
34
|
-
additionalForcedCondition: await getSourceAuditCondition(tableHandler, rules.select.forcedFilter,
|
|
35
|
-
tableColumnOverrides: getAuditRowColumnOverrides(tableHandler.parseFieldFilter(rules.select.fields),
|
|
34
|
+
additionalForcedCondition: await getSourceAuditCondition(tableHandler, rules.select.forcedFilter, excludeColumns),
|
|
35
|
+
tableColumnOverrides: getAuditRowColumnOverrides(tableHandler.parseFieldFilter(rules.select.fields), idColumns),
|
|
36
36
|
};
|
|
37
37
|
}))).filter(prostgles_types_1.isDefined);
|
|
38
38
|
if (!auditedTableRules.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuditTableRules.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":";;;AAAA,2CAAgC;AAChC,qDAAoF;AAIpF,8EAAgF;AAOhF,6CAA4E;AAE5E,yEAAsE;AAE/D,MAAM,kBAAkB,GAAG,KAAK,WAErC,KAA0B,EAC1B,sBAAsD,EACtD,SAAwC,EACxC,UAAyC,EACzC,KAAuC,EACvC,qBAAgD;IAEhD,IAAI,sBAAsB,EAAE,MAAM,EAAE,CAAC;QACnC,OAAO,sBAAsB,CAAC;IAChC,CAAC;IACD,IAAI,qBAAqB,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACnF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"getAuditTableRules.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishSchemas.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,eAAO,MAAM,iBAAiB,GAC5B,eAAe,aAAa,KAC3B,OAAO,CAAC,oBAAoB,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishSchemas.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,eAAO,MAAM,iBAAiB,GAC5B,eAAe,aAAa,KAC3B,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAsC1C,CAAC"}
|
|
@@ -14,7 +14,7 @@ const getPublishSchemas = async (publishParser) => {
|
|
|
14
14
|
const entries = publishParser.parsedPublish;
|
|
15
15
|
const { tablesOrViews = [] } = publishParser.prostgles.dboBuilder;
|
|
16
16
|
const profiles = (0, prostgles_types_1.fromEntries)(await Promise.all(entries.map(async ({ name, publish }) => {
|
|
17
|
-
const resolvedPublishObject = (0, getPublishedObjectFromResult_1.getPublishedObjectFromResult)(publish, tablesOrViews, undefined);
|
|
17
|
+
const resolvedPublishObject = (0, getPublishedObjectFromResult_1.getPublishedObjectFromResult)(publish, tablesOrViews, undefined, "schemaGeneration");
|
|
18
18
|
const tableNames = (0, getPublishedTableNames_1.getPublishedTableNames)(publishParser, resolvedPublishObject);
|
|
19
19
|
const tableSchema = [];
|
|
20
20
|
for (const tableName of tableNames) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishSchemas.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":";;;AAAA,qDAAkE;AAClE,yDAAyD;AACzD,qEAAkE;AAElE,0CAAyC;AACzC,iFAA8E;AAC9E,qEAAkE;AAG3D,MAAM,iBAAiB,GAAG,KAAK,EACpC,aAA4B,EACe,EAAE;IAC7C,IAAI,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC;IAC5C,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC;IAClE,MAAM,QAAQ,GAAyB,IAAA,6BAAW,EAChD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,qBAAqB,GAAG,IAAA,2DAA4B,EACxD,OAAO,EACP,aAAa,EACb,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishSchemas.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":";;;AAAA,qDAAkE;AAClE,yDAAyD;AACzD,qEAAkE;AAElE,0CAAyC;AACzC,iFAA8E;AAC9E,qEAAkE;AAG3D,MAAM,iBAAiB,GAAG,KAAK,EACpC,aAA4B,EACe,EAAE;IAC7C,IAAI,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC;IAC5C,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC;IAClE,MAAM,QAAQ,GAAyB,IAAA,6BAAW,EAChD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,qBAAqB,GAAG,IAAA,2DAA4B,EACxD,OAAO,EACP,aAAa,EACb,SAAS,EACT,kBAAkB,CACnB,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,+CAAsB,EAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QAChF,MAAM,WAAW,GAAoB,EAAE,CAAC;QACxC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC;gBAC9C,SAAS;gBACT,qBAAqB;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,SAAS;YAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAC5C,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,uBAAU,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC;gBAC3C,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,0BAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;aACtE,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC,CACH,CACF,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAxCW,QAAA,iBAAiB,qBAwC5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type TableSchema } from "prostgles-types";
|
|
2
2
|
import type { PublishedResult, PublishObject, PublishParams } from "./publishTypesAndUtils";
|
|
3
|
-
export declare const getPublishedObjectFromResult: (publish: PublishedResult | undefined, tablesOrViews: TableSchema[], publishParams: PublishParams | undefined) => PublishObject;
|
|
3
|
+
export declare const getPublishedObjectFromResult: (publish: PublishedResult | undefined, tablesOrViews: TableSchema[], publishParams: PublishParams | undefined, contextReplacementMode?: "runtime" | "schemaGeneration") => PublishObject;
|
|
4
4
|
//# sourceMappingURL=getPublishedObjectFromResult.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishedObjectFromResult.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAEV,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,4BAA4B,GACvC,SAAS,eAAe,GAAG,SAAS,EACpC,eAAe,WAAW,EAAE,EAC5B,eAAe,aAAa,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishedObjectFromResult.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAEV,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,4BAA4B,GACvC,SAAS,eAAe,GAAG,SAAS,EACpC,eAAe,WAAW,EAAE,EAC5B,eAAe,aAAa,GAAG,SAAS,EACxC,yBAAwB,SAAS,GAAG,kBAA8B,KACjE,aAmCF,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPublishedObjectFromResult = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const utils_1 = require("../utils/utils");
|
|
6
|
-
const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams) => {
|
|
6
|
+
const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams, contextReplacementMode = "runtime") => {
|
|
7
7
|
if (!publish)
|
|
8
8
|
return {};
|
|
9
9
|
if (publish === "*") {
|
|
@@ -30,15 +30,15 @@ const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams) =>
|
|
|
30
30
|
return [table.name, table.is_view ? (0, prostgles_types_1.pickKeys)(allTableRules, ["select"]) : allTableRules];
|
|
31
31
|
}));
|
|
32
32
|
}
|
|
33
|
-
return replaceContextPlaceholders(publish, publishParams);
|
|
33
|
+
return replaceContextPlaceholders(publish, publishParams, contextReplacementMode);
|
|
34
34
|
};
|
|
35
35
|
exports.getPublishedObjectFromResult = getPublishedObjectFromResult;
|
|
36
|
-
const replaceContextPlaceholders = (publish, publishParams) => {
|
|
36
|
+
const replaceContextPlaceholders = (publish, publishParams, mode) => {
|
|
37
37
|
const context = { user: publishParams?.user };
|
|
38
|
-
if (!publishParams)
|
|
38
|
+
if (!publishParams && mode === "runtime")
|
|
39
39
|
return publish;
|
|
40
40
|
if ((0, utils_1.isArray)(publish)) {
|
|
41
|
-
return publish.map((item) => replaceContextPlaceholders(item, publishParams));
|
|
41
|
+
return publish.map((item) => replaceContextPlaceholders(item, publishParams, mode));
|
|
42
42
|
}
|
|
43
43
|
if ((0, prostgles_types_1.isObject)(publish) && isPlainObject(publish)) {
|
|
44
44
|
const { data } = (0, prostgles_types_1.getJSONBSchemaValidationError)({
|
|
@@ -50,6 +50,8 @@ const replaceContextPlaceholders = (publish, publishParams) => {
|
|
|
50
50
|
}, publish, { allowExtraProperties: false });
|
|
51
51
|
if (data) {
|
|
52
52
|
data;
|
|
53
|
+
if (mode === "schemaGeneration")
|
|
54
|
+
return null;
|
|
53
55
|
const { objectName, objectPropertyName } = data["$prostglesContext"];
|
|
54
56
|
const contextObject = (0, prostgles_types_1.getProperty)(context, objectName);
|
|
55
57
|
if (!contextObject) {
|
|
@@ -63,7 +65,7 @@ const replaceContextPlaceholders = (publish, publishParams) => {
|
|
|
63
65
|
}
|
|
64
66
|
return Object.fromEntries(Object.entries(publish).map(([key, value]) => [
|
|
65
67
|
key,
|
|
66
|
-
replaceContextPlaceholders(value, publishParams),
|
|
68
|
+
replaceContextPlaceholders(value, publishParams, mode),
|
|
67
69
|
]));
|
|
68
70
|
}
|
|
69
71
|
return publish;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishedObjectFromResult.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AACzB,0CAAyC;AAQlC,MAAM,4BAA4B,GAAG,CAC1C,OAAoC,EACpC,aAA4B,EAC5B,aAAwC,
|
|
1
|
+
{"version":3,"file":"getPublishedObjectFromResult.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,15 +30,15 @@ export const getAuditTableRules = async function (
|
|
|
30
30
|
return auditTablePublishRules;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
const
|
|
34
|
-
(tableName) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media,
|
|
33
|
+
const auditedTableEntries = Object.entries(audit.tables).filter(
|
|
34
|
+
([tableName]) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media,
|
|
35
35
|
);
|
|
36
36
|
|
|
37
37
|
const auditTableHandler = this.dbo[audit.tableName]!;
|
|
38
38
|
|
|
39
39
|
const auditedTableRules = (
|
|
40
40
|
await Promise.all(
|
|
41
|
-
|
|
41
|
+
auditedTableEntries.map(async ([tableName, { idColumns, excludeColumns }]) => {
|
|
42
42
|
const tableHandler = this.dbo[tableName];
|
|
43
43
|
if (!tableHandler) return;
|
|
44
44
|
|
|
@@ -59,11 +59,11 @@ export const getAuditTableRules = async function (
|
|
|
59
59
|
additionalForcedCondition: await getSourceAuditCondition(
|
|
60
60
|
tableHandler,
|
|
61
61
|
rules.select.forcedFilter,
|
|
62
|
-
|
|
62
|
+
excludeColumns,
|
|
63
63
|
),
|
|
64
64
|
tableColumnOverrides: getAuditRowColumnOverrides(
|
|
65
65
|
tableHandler.parseFieldFilter(rules.select.fields),
|
|
66
|
-
|
|
66
|
+
idColumns,
|
|
67
67
|
),
|
|
68
68
|
};
|
|
69
69
|
}),
|
|
@@ -18,6 +18,7 @@ export const getPublishedObjectFromResult = (
|
|
|
18
18
|
publish: PublishedResult | undefined,
|
|
19
19
|
tablesOrViews: TableSchema[],
|
|
20
20
|
publishParams: PublishParams | undefined,
|
|
21
|
+
contextReplacementMode: "runtime" | "schemaGeneration" = "runtime",
|
|
21
22
|
): PublishObject => {
|
|
22
23
|
if (!publish) return {};
|
|
23
24
|
if (publish === "*") {
|
|
@@ -52,14 +53,18 @@ export const getPublishedObjectFromResult = (
|
|
|
52
53
|
);
|
|
53
54
|
}
|
|
54
55
|
|
|
55
|
-
return replaceContextPlaceholders(publish, publishParams);
|
|
56
|
+
return replaceContextPlaceholders(publish, publishParams, contextReplacementMode);
|
|
56
57
|
};
|
|
57
58
|
|
|
58
|
-
const replaceContextPlaceholders = <T>(
|
|
59
|
+
const replaceContextPlaceholders = <T>(
|
|
60
|
+
publish: T,
|
|
61
|
+
publishParams: PublishParams | undefined,
|
|
62
|
+
mode: "runtime" | "schemaGeneration",
|
|
63
|
+
): T => {
|
|
59
64
|
const context = { user: publishParams?.user };
|
|
60
|
-
if (!publishParams) return publish;
|
|
65
|
+
if (!publishParams && mode === "runtime") return publish;
|
|
61
66
|
if (isArray(publish)) {
|
|
62
|
-
return publish.map((item) => replaceContextPlaceholders(item, publishParams)) as T;
|
|
67
|
+
return publish.map((item) => replaceContextPlaceholders(item, publishParams, mode)) as T;
|
|
63
68
|
}
|
|
64
69
|
if (isObject(publish) && isPlainObject(publish)) {
|
|
65
70
|
const { data } = getJSONBSchemaValidationError(
|
|
@@ -75,6 +80,7 @@ const replaceContextPlaceholders = <T>(publish: T, publishParams: PublishParams
|
|
|
75
80
|
);
|
|
76
81
|
if (data) {
|
|
77
82
|
data satisfies PublishContextValue;
|
|
83
|
+
if (mode === "schemaGeneration") return null as T;
|
|
78
84
|
const { objectName, objectPropertyName } = data["$prostglesContext"];
|
|
79
85
|
const contextObject = getProperty(context, objectName);
|
|
80
86
|
if (!contextObject) {
|
|
@@ -91,7 +97,7 @@ const replaceContextPlaceholders = <T>(publish: T, publishParams: PublishParams
|
|
|
91
97
|
return Object.fromEntries(
|
|
92
98
|
Object.entries(publish).map(([key, value]) => [
|
|
93
99
|
key,
|
|
94
|
-
replaceContextPlaceholders(value, publishParams),
|
|
100
|
+
replaceContextPlaceholders(value, publishParams, mode),
|
|
95
101
|
]),
|
|
96
102
|
) as T;
|
|
97
103
|
}
|