prostgles-server 4.2.265 → 4.2.266
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/DboBuilder/ViewHandler/getValidatedSubscribeOptions.d.ts +4 -0
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.js +65 -0
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +5 -5
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.d.ts.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.js +105 -13
- package/dist/JSONBValidation/JSONBValidation.js.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.spec.js +17 -3
- package/dist/JSONBValidation/JSONBValidation.spec.js.map +1 -1
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.d.ts +1 -0
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.d.ts.map +1 -1
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.js +97 -96
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +7 -23
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +1 -1
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +17 -21
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +9 -4
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/pushSubData.js +1 -1
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts +72 -0
- package/lib/DboBuilder/ViewHandler/subscribe.ts +9 -6
- package/lib/JSONBValidation/JSONBValidation.spec.ts +38 -3
- package/lib/JSONBValidation/JSONBValidation.ts +102 -15
- package/lib/JSONBValidation/getJSONBSchemaTSTypes.ts +110 -110
- package/lib/PubSubManager/PubSubManager.ts +9 -8
- package/lib/PubSubManager/addSub.ts +20 -24
- package/lib/PubSubManager/notifListener.ts +16 -4
- package/lib/PubSubManager/pushSubData.ts +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type SubscribeOptions } from "prostgles-types";
|
|
2
|
+
import { type Required_ish, type SubscribeRule } from "../../PublishParser/PublishParser";
|
|
3
|
+
export declare const getValidatedSubscribeOptions: (rawVal: Required_ish<SubscribeOptions>, subscribeRule: SubscribeRule | undefined) => Required_ish<SubscribeOptions>;
|
|
4
|
+
//# sourceMappingURL=getValidatedSubscribeOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getValidatedSubscribeOptions.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE5E,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAE1F,eAAO,MAAM,4BAA4B,WAC/B,aAAa,gBAAgB,CAAC,iBACvB,aAAa,GAAG,SAAS,KACvC,aAAa,gBAAgB,CAgE/B,CAAC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getValidatedSubscribeOptions = void 0;
|
|
4
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const JSONBValidation_1 = require("../../JSONBValidation/JSONBValidation");
|
|
6
|
+
const getValidatedSubscribeOptions = (rawVal, subscribeRule) => {
|
|
7
|
+
const { data, error } = (0, JSONBValidation_1.getJSONBObjectSchemaValidationError)({
|
|
8
|
+
throttle: { type: "integer", optional: true },
|
|
9
|
+
throttleOpts: {
|
|
10
|
+
type: {
|
|
11
|
+
skipFirst: { type: "boolean", optional: true },
|
|
12
|
+
},
|
|
13
|
+
optional: true,
|
|
14
|
+
},
|
|
15
|
+
skipFirst: { type: "boolean", optional: true },
|
|
16
|
+
actions: {
|
|
17
|
+
oneOf: [
|
|
18
|
+
{
|
|
19
|
+
record: {
|
|
20
|
+
keysEnum: ["insert", "update", "delete"],
|
|
21
|
+
partial: true,
|
|
22
|
+
values: {
|
|
23
|
+
enum: [true],
|
|
24
|
+
},
|
|
25
|
+
},
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
record: {
|
|
29
|
+
keysEnum: ["insert", "update", "delete"],
|
|
30
|
+
partial: true,
|
|
31
|
+
values: {
|
|
32
|
+
enum: [false],
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
],
|
|
37
|
+
optional: true,
|
|
38
|
+
},
|
|
39
|
+
}, rawVal, "subscribeParams");
|
|
40
|
+
if (error !== undefined) {
|
|
41
|
+
throw error;
|
|
42
|
+
}
|
|
43
|
+
const publishedThrottle = subscribeRule?.throttle || 0;
|
|
44
|
+
const { actions, throttleOpts, skipFirst, throttle = publishedThrottle } = data;
|
|
45
|
+
if (actions && (0, prostgles_types_1.isEmpty)(actions)) {
|
|
46
|
+
throw `addSub: actions cannot be empty`;
|
|
47
|
+
}
|
|
48
|
+
if (publishedThrottle &&
|
|
49
|
+
Number.isInteger(publishedThrottle) &&
|
|
50
|
+
publishedThrottle > 0 &&
|
|
51
|
+
throttle < publishedThrottle) {
|
|
52
|
+
throw `addSub: throttle ${throttle} is less than the minimum allowed throttle ${publishedThrottle}`;
|
|
53
|
+
}
|
|
54
|
+
if ((0, prostgles_types_1.isDefined)(throttle) && !Number.isInteger(throttle)) {
|
|
55
|
+
throw `addSub: throttle ${throttle} must be an integer`;
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
actions: actions,
|
|
59
|
+
skipFirst,
|
|
60
|
+
throttle,
|
|
61
|
+
throttleOpts,
|
|
62
|
+
};
|
|
63
|
+
};
|
|
64
|
+
exports.getValidatedSubscribeOptions = getValidatedSubscribeOptions;
|
|
65
|
+
//# sourceMappingURL=getValidatedSubscribeOptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getValidatedSubscribeOptions.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":";;;AAAA,qDAA4E;AAC5E,2EAA4F;AAGrF,MAAM,4BAA4B,GAAG,CAC1C,MAAsC,EACtC,aAAwC,EACR,EAAE;IAClC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,qDAAmC,EACzD;QACE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,YAAY,EAAE;YACZ,IAAI,EAAE;gBACJ,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC/C;YACD,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,OAAO,EAAE;YACP,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;wBACxC,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC,IAAI,CAAC;yBACb;qBACF;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;wBACxC,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC,KAAK,CAAC;yBACd;qBACF;iBACF;aACF;YACD,QAAQ,EAAE,IAAI;SACf;KACO,EACV,MAAM,EACN,iBAAiB,CAClB,CAAC;IACF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,iBAAiB,GAAG,aAAa,EAAE,QAAQ,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAChF,IAAI,OAAO,IAAI,IAAA,yBAAO,EAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,iCAAiC,CAAC;IAC1C,CAAC;IACD,IACE,iBAAiB;QACjB,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACnC,iBAAiB,GAAG,CAAC;QACrB,QAAQ,GAAG,iBAAiB,EAC5B,CAAC;QACD,MAAM,oBAAoB,QAAQ,8CAA8C,iBAAiB,EAAE,CAAC;IACtG,CAAC;IACD,IAAI,IAAA,2BAAS,EAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,oBAAoB,QAAQ,qBAAqB,CAAC;IAC1D,CAAC;IACD,OAAO;QACL,OAAO,EAAE,OAAO;QAChB,SAAS;QACT,QAAQ;QACR,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,4BAA4B,gCAmEvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EACL,MAAM,
|
|
1
|
+
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EACL,MAAM,EAGN,WAAW,EACZ,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,KAAK,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC;AAC1C,MAAM,MAAM,UAAU,GAClB;IACE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,GACD,MAAM,CAAC;AAEX,eAAO,MAAM,aAAa,eAAgB,UAAU,GAAG,SAAS,KAAG,MAAM,GAAG,SAE3E,CAAC;AACF,eAAO,MAAM,iBAAiB,gBACf,UAAU,GAAG,SAAS,eACtB,UAAU,GAAG,SAAS,wBAGpC,CAAC;AACF,eAAO,MAAM,eAAe,gBACb,UAAU,GAAG,SAAS,KAClC,QAAQ,UAAU,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAS5C,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,SAAS,EACrB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAwHjC,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.subscribe = exports.parseLocalFuncs = exports.matchesLocalFuncs = exports.getOnDataFunc = void 0;
|
|
4
4
|
const DboBuilder_1 = require("../DboBuilder");
|
|
5
5
|
const getSubscribeRelatedTables_1 = require("../getSubscribeRelatedTables");
|
|
6
|
+
const getValidatedSubscribeOptions_1 = require("./getValidatedSubscribeOptions");
|
|
6
7
|
const getOnDataFunc = (localFuncs) => {
|
|
7
8
|
return typeof localFuncs === "function" ? localFuncs : localFuncs?.onData;
|
|
8
9
|
};
|
|
@@ -37,7 +38,7 @@ async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
|
37
38
|
console.error({ localParams, localFuncs });
|
|
38
39
|
throw " Cannot have localFunc AND socket ";
|
|
39
40
|
}
|
|
40
|
-
const { throttle
|
|
41
|
+
const { throttle, throttleOpts, skipFirst, actions, ...selectParams } = params;
|
|
41
42
|
/** Ensure request is valid */
|
|
42
43
|
await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams);
|
|
43
44
|
const newQuery = (await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, { ...localParams, returnNewQuery: true }));
|
|
@@ -55,10 +56,9 @@ async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
|
55
56
|
condition: newQuery.whereOpts.condition,
|
|
56
57
|
table_name: this.name,
|
|
57
58
|
filter: { ...filter },
|
|
58
|
-
|
|
59
|
-
throttle,
|
|
60
|
-
|
|
61
|
-
last_throttled: 0,
|
|
59
|
+
selectParams: { ...selectParams },
|
|
60
|
+
subscribeOptions: (0, getValidatedSubscribeOptions_1.getValidatedSubscribeOptions)({ actions, skipFirst, throttle, throttleOpts }, table_rules?.subscribe),
|
|
61
|
+
lastPushed: 0,
|
|
62
62
|
};
|
|
63
63
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
64
64
|
if (!localFuncs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":";;;AAEA,8CAKuB;AACvB,4EAAyE;
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONBValidation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"JSONBValidation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtF,eAAO,MAAM,eAAe,iBAAkB,MAAM,SAAS,KAAG,MAAM,YAIrE,CAAC;AAsLF,eAAO,MAAM,mCAAmC;;mBAEzC,GAAG,WACC,MAAM;WAEL,MAAM;WAAS,SAAS;;YAAe,SAAS;;CAY3D,CAAC;AACF,eAAO,MAAM,gCAAgC;;mBAEtC,GAAG,WACC,MAAM,sDAKhB,CAAC;AACF,eAAO,MAAM,8BAA8B;;mBAEpC,GAAG,WACC,MAAM,8DAOhB,CAAC"}
|
|
@@ -46,33 +46,32 @@ const getValidator = (type) => {
|
|
|
46
46
|
}
|
|
47
47
|
return { isArray: false, validator };
|
|
48
48
|
};
|
|
49
|
-
const getPropertyValidationError = (
|
|
50
|
-
|
|
49
|
+
const getPropertyValidationError = (value, rawFieldType, path = []) => {
|
|
50
|
+
const err = `${path.join(".")} is of invalid type. Expecting ${getTypeDescription(rawFieldType).replaceAll("\n", "")}`;
|
|
51
51
|
const fieldType = (0, exports.getFieldTypeObj)(rawFieldType);
|
|
52
52
|
const { type, allowedValues, nullable, optional } = fieldType;
|
|
53
|
-
if (nullable &&
|
|
53
|
+
if (nullable && value === null)
|
|
54
54
|
return;
|
|
55
|
-
if (optional &&
|
|
55
|
+
if (optional && value === undefined)
|
|
56
56
|
return;
|
|
57
57
|
if (allowedValues) {
|
|
58
58
|
throw new Error(`Allowed values are not supported for validation`);
|
|
59
59
|
}
|
|
60
60
|
if (type) {
|
|
61
61
|
if ((0, prostgles_types_1.isObject)(type)) {
|
|
62
|
-
if (!(0, prostgles_types_1.isObject)(
|
|
63
|
-
return
|
|
62
|
+
if (!(0, prostgles_types_1.isObject)(value)) {
|
|
63
|
+
return err;
|
|
64
64
|
}
|
|
65
65
|
for (const [subKey, subSchema] of (0, prostgles_types_1.getObjectEntries)(type)) {
|
|
66
|
-
const error = getPropertyValidationError(
|
|
67
|
-
if (error) {
|
|
66
|
+
const error = getPropertyValidationError(value[subKey], subSchema, [...path, subKey]);
|
|
67
|
+
if (error !== undefined) {
|
|
68
68
|
return error;
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
|
-
err += type;
|
|
74
73
|
const { validator } = getValidator(type);
|
|
75
|
-
const isValid = validator(
|
|
74
|
+
const isValid = validator(value);
|
|
76
75
|
if (!isValid) {
|
|
77
76
|
return err;
|
|
78
77
|
}
|
|
@@ -84,13 +83,106 @@ const getPropertyValidationError = (key, val, rawFieldType, path = []) => {
|
|
|
84
83
|
otherOptions.push(null);
|
|
85
84
|
if (fieldType.optional)
|
|
86
85
|
otherOptions.push(undefined);
|
|
87
|
-
err += `one of: ${JSON.stringify([...fieldType.enum, ...otherOptions]).slice(1, -1)}`;
|
|
88
|
-
if (!fieldType.enum.includes(
|
|
86
|
+
// err += `one of: ${JSON.stringify([...fieldType.enum, ...otherOptions]).slice(1, -1)}`;
|
|
87
|
+
if (!fieldType.enum.includes(value))
|
|
89
88
|
return err;
|
|
90
89
|
return;
|
|
91
90
|
}
|
|
91
|
+
if (fieldType.oneOf) {
|
|
92
|
+
if (!fieldType.oneOf.length) {
|
|
93
|
+
return err + "to not be empty";
|
|
94
|
+
}
|
|
95
|
+
let firstError;
|
|
96
|
+
const validMember = fieldType.oneOf.find((member) => {
|
|
97
|
+
const error = getPropertyValidationError(value, member, path);
|
|
98
|
+
firstError ??= error;
|
|
99
|
+
return error === undefined;
|
|
100
|
+
});
|
|
101
|
+
if (validMember) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
return err;
|
|
105
|
+
}
|
|
106
|
+
if (fieldType.record) {
|
|
107
|
+
const { keysEnum, partial, values: valuesSchema } = fieldType.record;
|
|
108
|
+
if (!(0, prostgles_types_1.isObject)(value)) {
|
|
109
|
+
return err + "object";
|
|
110
|
+
}
|
|
111
|
+
if (partial && (0, prostgles_types_1.isEmpty)(value)) {
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
const valueKeys = (0, prostgles_types_1.getKeys)(value);
|
|
115
|
+
const missingKey = partial ? undefined : keysEnum?.find((key) => !valueKeys.includes(key));
|
|
116
|
+
if (missingKey !== undefined) {
|
|
117
|
+
return `${err} to have key ${missingKey}`;
|
|
118
|
+
}
|
|
119
|
+
const extraKeys = valueKeys.filter((key) => !keysEnum?.includes(key));
|
|
120
|
+
if (extraKeys.length) {
|
|
121
|
+
return `${err} has extra keys: ${extraKeys}`;
|
|
122
|
+
}
|
|
123
|
+
if (valuesSchema) {
|
|
124
|
+
for (const [propKey, propValue] of Object.entries(value)) {
|
|
125
|
+
const valError = getPropertyValidationError(propValue, valuesSchema, [...path, propKey]);
|
|
126
|
+
if (valError !== undefined) {
|
|
127
|
+
return `${valError}`;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
92
133
|
return `Could not validate field type: ${JSON.stringify(fieldType)}`;
|
|
93
134
|
};
|
|
135
|
+
const getTypeDescription = (schema) => {
|
|
136
|
+
const schemaObj = (0, exports.getFieldTypeObj)(schema);
|
|
137
|
+
const { type, nullable, optional, oneOf, record } = schemaObj;
|
|
138
|
+
const allowedTypes = [];
|
|
139
|
+
if (nullable)
|
|
140
|
+
allowedTypes.push("null");
|
|
141
|
+
if (optional)
|
|
142
|
+
allowedTypes.push("undefined");
|
|
143
|
+
if (typeof type === "string") {
|
|
144
|
+
allowedTypes.push(type);
|
|
145
|
+
}
|
|
146
|
+
else if (type) {
|
|
147
|
+
if ((0, prostgles_types_1.isObject)(type)) {
|
|
148
|
+
const keyOpts = [];
|
|
149
|
+
Object.entries(type).forEach(([key, value]) => {
|
|
150
|
+
keyOpts.push(`${key}: ${getTypeDescription(value)}`);
|
|
151
|
+
});
|
|
152
|
+
allowedTypes.push(`{ ${keyOpts.join("; ")} }`);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
schemaObj.enum?.forEach((v) => {
|
|
156
|
+
if (v === null) {
|
|
157
|
+
allowedTypes.push("null");
|
|
158
|
+
}
|
|
159
|
+
else if (v === undefined) {
|
|
160
|
+
allowedTypes.push("undefined");
|
|
161
|
+
}
|
|
162
|
+
else if (typeof v === "string") {
|
|
163
|
+
allowedTypes.push(JSON.stringify(v));
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
allowedTypes.push(v);
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
oneOf?.forEach((v) => {
|
|
170
|
+
const type = getTypeDescription(v);
|
|
171
|
+
allowedTypes.push(type);
|
|
172
|
+
});
|
|
173
|
+
if (record) {
|
|
174
|
+
const { keysEnum, partial, values } = record;
|
|
175
|
+
const optional = partial ? "?" : "";
|
|
176
|
+
const valueType = !values ? "any" : getTypeDescription(values);
|
|
177
|
+
if (keysEnum) {
|
|
178
|
+
allowedTypes.push(`{ [${keysEnum.join(" | ")}]${optional}: ${valueType} }`);
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
allowedTypes.push(`{ [key: string]${optional}: ${valueType} }`);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return allowedTypes.join(" | ");
|
|
185
|
+
};
|
|
94
186
|
const getJSONBObjectSchemaValidationError = (schema, obj, objName, optional = false) => {
|
|
95
187
|
if (obj === undefined && !optional)
|
|
96
188
|
return { error: `Expecting ${objName} to be defined` };
|
|
@@ -98,7 +190,7 @@ const getJSONBObjectSchemaValidationError = (schema, obj, objName, optional = fa
|
|
|
98
190
|
return { error: `Expecting ${objName} to be an object` };
|
|
99
191
|
}
|
|
100
192
|
for (const [k, objSchema] of Object.entries(schema)) {
|
|
101
|
-
const error = getPropertyValidationError(
|
|
193
|
+
const error = getPropertyValidationError(obj[k], objSchema, [k]);
|
|
102
194
|
if (error) {
|
|
103
195
|
return { error };
|
|
104
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONBValidation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"JSONBValidation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":";;;AAAA,qDAAsF;AAE/E,MAAM,eAAe,GAAG,CAAC,YAA6B,EAAsB,EAAE;IACnF,IAAI,OAAO,YAAY,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAEpE,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAMF,MAAM,oBAAoB,GAAiD;IACzE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ;IACxC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;IAChE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,SAAS;IAC1C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ;IACtC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ;IAC3C,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,UAAU,IAAI,OAAO,GAAG,KAAK,QAAQ;IAClE,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ;IACtC,MAAM,EAAE,GAAG,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;CACF,CAAC;AACF,MAAM,yBAAyB,GAAG,IAAA,yBAAO,EAAC,oBAAoB,CAAC,CAAC;AAChE,MAAM,cAAc,GAAG,CAAqB,IAAO,EAA8B,EAAE;IACjF,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAA4B,CAAC,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,WAA6B,CAAC;IACvC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAA+B,EAAE,EAAE;IACvD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACxE,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAqB,CAAC,CAAC;IAC9D,IAAI,CAAE,SAAiB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CACjC,KAAU,EACV,YAA6B,EAC7B,OAAiB,EAAE,EACC,EAAE;IACtB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,kCAAkC,kBAAkB,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IACvH,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;IAEhD,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC9D,IAAI,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO;IACvC,IAAI,QAAQ,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO;IAC5C,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,IAAA,0BAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,IAAA,0BAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAC;YACb,CAAC;YACD,KAAK,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,IAAA,kCAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,KAAK,GAAG,0BAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;gBACtF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,SAAS,CAAC,QAAQ;YAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,SAAS,CAAC,QAAQ;YAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,yFAAyF;QAEzF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QAChD,OAAO;IACT,CAAC;IACD,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC5B,OAAO,GAAG,GAAG,iBAAiB,CAAC;QACjC,CAAC;QACD,IAAI,UAA8B,CAAC;QACnC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC9D,UAAU,KAAK,KAAK,CAAC;YACrB,OAAO,KAAK,KAAK,SAAS,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;QACrE,IAAI,CAAC,IAAA,0BAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,GAAG,GAAG,QAAQ,CAAC;QACxB,CAAC;QACD,IAAI,OAAO,IAAI,IAAA,yBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,yBAAO,EAAC,KAAK,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3F,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,GAAG,GAAG,gBAAgB,UAAU,EAAE,CAAC;QAC5C,CAAC;QACD,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,OAAO,GAAG,GAAG,oBAAoB,SAAS,EAAE,CAAC;QAC/C,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBACzF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,OAAO,GAAG,QAAQ,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IACD,OAAO,kCAAkC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAuB,EAAU,EAAE;IAC7D,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9D,MAAM,YAAY,GAAU,EAAE,CAAC;IAC/B,IAAI,QAAQ;QAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,QAAQ;QAAE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;SAAM,IAAI,IAAI,EAAE,CAAC;QAChB,IAAI,IAAA,0BAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;YACnB,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC5C,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IACD,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACf,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;aAAM,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACnC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,QAAQ,EAAE,CAAC;YACb,YAAY,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,IAAI,CAAC,kBAAkB,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC;AAEK,MAAM,mCAAmC,GAAG,CACjD,MAAS,EACT,GAAQ,EACR,OAAe,EACf,QAAQ,GAAG,KAAK,EAC2E,EAAE;IAC7F,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,aAAa,OAAO,gBAAgB,EAAE,CAAC;IAC3F,IAAI,CAAC,IAAA,0BAAQ,EAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,aAAa,OAAO,kBAAkB,EAAE,CAAC;IAC3D,CAAC;IACD,KAAK,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,EAAE,KAAK,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,GAA6B,EAAE,CAAC;AACjD,CAAC,CAAC;AAjBW,QAAA,mCAAmC,uCAiB9C;AACK,MAAM,gCAAgC,GAAG,CAC9C,MAAS,EACT,GAAQ,EACR,OAAe,EACf,QAAQ,GAAG,KAAK,EACe,EAAE;IACjC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,2CAAmC,EAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,OAAO,KAAK,KAAK,SAAS,CAAC;AAC7B,CAAC,CAAC;AARW,QAAA,gCAAgC,oCAQ3C;AACK,MAAM,8BAA8B,GAAG,CAC5C,MAAS,EACT,GAAQ,EACR,OAAe,EACf,QAAQ,GAAG,KAAK,EACuB,EAAE;IACzC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,2CAAmC,EAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,8BAA8B,kCAUzC"}
|
|
@@ -40,15 +40,29 @@ void (0, node_test_1.describe)("JSONBValidation", async () => {
|
|
|
40
40
|
data: { ...obj, age: null },
|
|
41
41
|
});
|
|
42
42
|
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, age: 22.2 }, "test"), {
|
|
43
|
-
error: "age is of invalid type. Expecting integer",
|
|
43
|
+
error: "age is of invalid type. Expecting null | integer",
|
|
44
44
|
});
|
|
45
45
|
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, city: 22 } }, "test"), {
|
|
46
46
|
error: "address.city is of invalid type. Expecting string",
|
|
47
47
|
});
|
|
48
|
-
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, street_number: 22.22 } }, "test"), { error: "address.street_number is of invalid type. Expecting integer" });
|
|
48
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, street_number: 22.22 } }, "test"), { error: "address.street_number is of invalid type. Expecting undefined | integer" });
|
|
49
49
|
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, street_number: undefined } }, "test"), { data: { ...obj, address: { ...obj.address, street_number: undefined } } });
|
|
50
50
|
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, t: "c" } }, "test"), { data: { ...obj, address: { ...obj.address, t: "c" } } });
|
|
51
|
-
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, t: 2 } }, "test"), { error: 'address.t is of invalid type. Expecting
|
|
51
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, t: 2 } }, "test"), { error: 'address.t is of invalid type. Expecting undefined | "a" | "b" | "c"' });
|
|
52
|
+
});
|
|
53
|
+
await (0, node_test_1.test)("getJSONBObjectSchemaValidationError oneOf record", () => {
|
|
54
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)({
|
|
55
|
+
d: { record: { keysEnum: ["a", "b"], values: "boolean" } },
|
|
56
|
+
o: { optional: true, oneOf: ["number", "string[]"] },
|
|
57
|
+
}, { d: { a: true, b: 1 } }, "test"), { error: "d.b is of invalid type. Expecting boolean" });
|
|
58
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)({
|
|
59
|
+
d: { record: { keysEnum: ["a", "b"], values: "boolean" } },
|
|
60
|
+
o: { optional: true, oneOf: ["number", "string[]"] },
|
|
61
|
+
}, { d: { a: true, b: true }, o: false }, "test"), { error: "o is of invalid type. Expecting undefined | number | string[]" });
|
|
62
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)({
|
|
63
|
+
d: { record: { keysEnum: ["a", "b"], values: "boolean" } },
|
|
64
|
+
o: { optional: true, oneOf: ["number", "string[]"] },
|
|
65
|
+
}, { d: { a: true, b: true }, o: ["str"] }, "test"), { data: { d: { a: true, b: true }, o: ["str"] } });
|
|
52
66
|
});
|
|
53
67
|
});
|
|
54
68
|
//# sourceMappingURL=JSONBValidation.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONBValidation.spec.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.spec.ts"],"names":[],"mappings":";;AAAA,yCAA2C;AAE3C,mCAA0C;AAC1C,uDAAwE;AAExE,KAAK,IAAA,oBAAQ,EAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IAC1C,MAAM,IAAA,gBAAI,EAAC,qCAAqC,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAqB;YAC/B,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACxC,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ,MAAM,EAAE,QAAQ;wBAChB,IAAI,EAAE,QAAQ;wBACd,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;wBAClD,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;qBAC7C;iBACF;aACF;SACF,CAAC;QACF,MAAM,GAAG,GAAG;YACV,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,EAAE;YACP,OAAO,EAAE;gBACP,MAAM,EAAE,aAAa;gBACrB,IAAI,EAAE,UAAU;aACjB;SACF,CAAC;QACF,eAAM,CAAC,eAAe,CAAC,IAAA,qDAAmC,EAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE;YACrF,KAAK,EAAE,gCAAgC;SACxC,CAAC,CAAC;QACH,eAAM,CAAC,eAAe,CAAC,IAAA,qDAAmC,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE;YACnF,KAAK,EAAE,2CAA2C;SACnD,CAAC,CAAC;QACH,eAAM,CAAC,eAAe,CAAC,IAAA,qDAAmC,EAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;YACpF,IAAI,EAAE,GAAG;SACV,CAAC,CAAC;QACH,eAAM,CAAC,eAAe,CACpB,IAAA,qDAAmC,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,EAC/E;YACE,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE;SAC5B,CACF,CAAC;QACF,eAAM,CAAC,eAAe,CACpB,IAAA,qDAAmC,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,EAC/E;YACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"JSONBValidation.spec.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@ type ColOpts = {
|
|
|
3
3
|
nullable?: boolean;
|
|
4
4
|
};
|
|
5
5
|
export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, outerLeading: string | undefined, tables: TableSchema[]): string;
|
|
6
|
+
export declare const getJSONBTSTypes: (tables: TableSchema[], rawFieldType: JSONB.FieldType, isOneOf?: boolean, innerLeading?: string, depth?: number) => string;
|
|
6
7
|
export {};
|
|
7
8
|
//# sourceMappingURL=getJSONBSchemaTSTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJSONBSchemaTSTypes.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/getJSONBSchemaTSTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKlF,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtC,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,CAAC,WAAW,EACzB,OAAO,EAAE,OAAO,EAChB,YAAY,oBAAK,EACjB,MAAM,EAAE,WAAW,EAAE,GACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"getJSONBSchemaTSTypes.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/getJSONBSchemaTSTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKlF,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtC,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,CAAC,WAAW,EACzB,OAAO,EAAE,OAAO,EAChB,YAAY,oBAAK,EACjB,MAAM,EAAE,WAAW,EAAE,GACpB,MAAM,CAOR;AAED,eAAO,MAAM,eAAe,WAClB,WAAW,EAAE,gBACP,MAAM,SAAS,+DAI5B,MAuGF,CAAC"}
|
|
@@ -1,114 +1,115 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getJSONBSchemaTSTypes = void 0;
|
|
3
|
+
exports.getJSONBTSTypes = exports.getJSONBSchemaTSTypes = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder/DboBuilder");
|
|
6
6
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
7
7
|
const JSONBValidation_1 = require("./JSONBValidation");
|
|
8
8
|
function getJSONBSchemaTSTypes(schema, colOpts, outerLeading = "", tables) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
else if ((0, prostgles_types_1.isObject)(fieldType.type)) {
|
|
26
|
-
const addSemicolonIfMissing = (v) => (v.trim().endsWith(";") ? v : v.trim() + ";");
|
|
27
|
-
const { type } = fieldType;
|
|
28
|
-
const spacing = isOneOf ? " " : " ";
|
|
29
|
-
let objDef = ` {${spacing}` +
|
|
30
|
-
(0, prostgles_types_1.getKeys)(type)
|
|
31
|
-
.map((key) => {
|
|
32
|
-
const fieldType = (0, JSONBValidation_1.getFieldTypeObj)(type[key]);
|
|
33
|
-
const escapedKey = isValidIdentifier(key) ? key : JSON.stringify(key);
|
|
34
|
-
return (`${spacing}${escapedKey}${fieldType.optional ? "?" : ""}: ` +
|
|
35
|
-
addSemicolonIfMissing(getFieldType(fieldType, true, undefined, depth + 1)));
|
|
36
|
-
})
|
|
37
|
-
.join(" ") +
|
|
38
|
-
`${spacing}}`;
|
|
39
|
-
if (!isOneOf) {
|
|
40
|
-
objDef = addSemicolonIfMissing(objDef);
|
|
41
|
-
}
|
|
42
|
-
/** Keep single line */
|
|
43
|
-
if (isOneOf) {
|
|
44
|
-
objDef = objDef.split("\n").join("");
|
|
45
|
-
}
|
|
46
|
-
return nullType + objDef;
|
|
47
|
-
}
|
|
48
|
-
else if (fieldType.enum) {
|
|
49
|
-
return nullType + fieldType.enum.map((v) => (0, PubSubManager_1.asValue)(v)).join(" | ");
|
|
50
|
-
}
|
|
51
|
-
else if (fieldType.oneOf || fieldType.oneOfType) {
|
|
52
|
-
const oneOf = fieldType.oneOf || fieldType.oneOfType.map((type) => ({ type }));
|
|
53
|
-
return ((fieldType.nullable ? `\n${innerLeading} | null` : "") +
|
|
54
|
-
oneOf
|
|
55
|
-
.map((v) => `\n${innerLeading} | ` + getFieldType(v, true, undefined, depth + 1))
|
|
56
|
-
.join(""));
|
|
9
|
+
return (0, exports.getJSONBTSTypes)(tables, { ...schema, nullable: colOpts.nullable }, undefined, outerLeading);
|
|
10
|
+
}
|
|
11
|
+
exports.getJSONBSchemaTSTypes = getJSONBSchemaTSTypes;
|
|
12
|
+
const getJSONBTSTypes = (tables, rawFieldType, isOneOf = false, innerLeading = "", depth = 0) => {
|
|
13
|
+
const fieldType = (0, JSONBValidation_1.getFieldTypeObj)(rawFieldType);
|
|
14
|
+
const nullType = fieldType.nullable ? `null | ` : "";
|
|
15
|
+
/** Primitives */
|
|
16
|
+
if (typeof fieldType.type === "string") {
|
|
17
|
+
const correctType = fieldType.type
|
|
18
|
+
.replace("integer", "number")
|
|
19
|
+
.replace("time", "string")
|
|
20
|
+
.replace("timestamp", "string")
|
|
21
|
+
.replace("Date", "string");
|
|
22
|
+
if (fieldType.allowedValues && fieldType.type.endsWith("[]")) {
|
|
23
|
+
return nullType + ` (${fieldType.allowedValues.map((v) => JSON.stringify(v)).join(" | ")})[]`;
|
|
57
24
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
25
|
+
return nullType + correctType;
|
|
26
|
+
/** Object */
|
|
27
|
+
}
|
|
28
|
+
else if ((0, prostgles_types_1.isObject)(fieldType.type)) {
|
|
29
|
+
const addSemicolonIfMissing = (v) => (v.trim().endsWith(";") ? v : v.trim() + ";");
|
|
30
|
+
const { type } = fieldType;
|
|
31
|
+
const spacing = isOneOf ? " " : " ";
|
|
32
|
+
let objDef = ` {${spacing}` +
|
|
33
|
+
(0, prostgles_types_1.getKeys)(type)
|
|
34
|
+
.map((key) => {
|
|
35
|
+
const fieldType = (0, JSONBValidation_1.getFieldTypeObj)(type[key]);
|
|
36
|
+
const escapedKey = isValidIdentifier(key) ? key : JSON.stringify(key);
|
|
37
|
+
return (`${spacing}${escapedKey}${fieldType.optional ? "?" : ""}: ` +
|
|
38
|
+
addSemicolonIfMissing((0, exports.getJSONBTSTypes)(tables, fieldType, true, undefined, depth + 1)));
|
|
39
|
+
})
|
|
40
|
+
.join(" ") +
|
|
41
|
+
`${spacing}}`;
|
|
42
|
+
if (!isOneOf) {
|
|
43
|
+
objDef = addSemicolonIfMissing(objDef);
|
|
61
44
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
const getRecord = (v) => (partial ? `Partial<Record<${v}>>` : `Record<${v}>`);
|
|
66
|
-
return `${fieldType.nullable ? `null |` : ""} ${getRecord(`${keysEnum?.map((v) => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : getFieldType(values, true, undefined, depth + 1)}`)}`;
|
|
45
|
+
/** Keep single line */
|
|
46
|
+
if (isOneOf) {
|
|
47
|
+
objDef = objDef.split("\n").join("");
|
|
67
48
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
49
|
+
return nullType + objDef;
|
|
50
|
+
}
|
|
51
|
+
else if (fieldType.enum) {
|
|
52
|
+
return nullType + fieldType.enum.map((v) => (0, PubSubManager_1.asValue)(v)).join(" | ");
|
|
53
|
+
}
|
|
54
|
+
else if (fieldType.oneOf || fieldType.oneOfType) {
|
|
55
|
+
const oneOf = fieldType.oneOf || fieldType.oneOfType.map((type) => ({ type }));
|
|
56
|
+
return ((fieldType.nullable ? `\n${innerLeading} | null` : "") +
|
|
57
|
+
oneOf
|
|
58
|
+
.map((v) => `\n${innerLeading} | ` + (0, exports.getJSONBTSTypes)(tables, v, true, undefined, depth + 1))
|
|
59
|
+
.join(""));
|
|
60
|
+
}
|
|
61
|
+
else if (fieldType.arrayOf || fieldType.arrayOfType) {
|
|
62
|
+
const arrayOf = fieldType.arrayOf || { type: fieldType.arrayOfType };
|
|
63
|
+
return `${fieldType.nullable ? `null | ` : ""} ( ${(0, exports.getJSONBTSTypes)(tables, arrayOf, true, undefined, depth + 1)} )[]`;
|
|
64
|
+
}
|
|
65
|
+
else if (fieldType.record) {
|
|
66
|
+
const { keysEnum, values, partial } = fieldType.record;
|
|
67
|
+
// TODO: ensure props with undefined values are not allowed in the TS type (strict union)
|
|
68
|
+
const getRecord = (v) => (partial ? `Partial<Record<${v}>>` : `Record<${v}>`);
|
|
69
|
+
return `${fieldType.nullable ? `null |` : ""} ${getRecord(`${keysEnum?.map((v) => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : (0, exports.getJSONBTSTypes)(tables, values, true, undefined, depth + 1)}`)}`;
|
|
70
|
+
}
|
|
71
|
+
else if (fieldType.lookup) {
|
|
72
|
+
const l = fieldType.lookup;
|
|
73
|
+
if (l.type === "data-def") {
|
|
74
|
+
return `${fieldType.nullable ? `null |` : ""} ${(0, exports.getJSONBTSTypes)(tables, {
|
|
75
|
+
type: {
|
|
76
|
+
table: "string",
|
|
77
|
+
column: "string",
|
|
78
|
+
filter: { record: {}, optional: true },
|
|
79
|
+
isArray: { type: "boolean", optional: true },
|
|
80
|
+
searchColumns: { type: "string[]", optional: true },
|
|
81
|
+
isFullRow: {
|
|
82
|
+
optional: true,
|
|
83
|
+
type: {
|
|
84
|
+
displayColumns: { type: "string[]", optional: true },
|
|
83
85
|
},
|
|
84
|
-
showInRowCard: { optional: true, record: {} },
|
|
85
86
|
},
|
|
86
|
-
|
|
87
|
+
showInRowCard: { optional: true, record: {} },
|
|
88
|
+
},
|
|
89
|
+
})}`;
|
|
90
|
+
}
|
|
91
|
+
const isSChema = l.type === "schema";
|
|
92
|
+
let type = isSChema ?
|
|
93
|
+
l.object === "table" ?
|
|
94
|
+
"string"
|
|
95
|
+
: `{ "table": string; "column": string; }`
|
|
96
|
+
: "";
|
|
97
|
+
if (!isSChema) {
|
|
98
|
+
const cols = tables.find((t) => t.name === l.table)?.columns;
|
|
99
|
+
if (!l.isFullRow) {
|
|
100
|
+
type = (0, DboBuilder_1.postgresToTsType)(cols?.find((c) => c.name === l.column)?.udt_name ?? "text");
|
|
87
101
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
"string"
|
|
92
|
-
: `{ "table": string; "column": string; }`
|
|
93
|
-
: "";
|
|
94
|
-
if (!isSChema) {
|
|
95
|
-
const cols = tables.find((t) => t.name === l.table)?.columns;
|
|
96
|
-
if (!l.isFullRow) {
|
|
97
|
-
type = (0, DboBuilder_1.postgresToTsType)(cols?.find((c) => c.name === l.column)?.udt_name ?? "text");
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
type =
|
|
101
|
-
!cols ? "any" : (`{ ${cols.map((c) => `${JSON.stringify(c.name)}: ${c.is_nullable ? "null | " : ""} ${(0, DboBuilder_1.postgresToTsType)(c.udt_name)}; `).join(" ")} }`);
|
|
102
|
-
}
|
|
102
|
+
else {
|
|
103
|
+
type =
|
|
104
|
+
!cols ? "any" : (`{ ${cols.map((c) => `${JSON.stringify(c.name)}: ${c.is_nullable ? "null | " : ""} ${(0, DboBuilder_1.postgresToTsType)(c.udt_name)}; `).join(" ")} }`);
|
|
103
105
|
}
|
|
104
|
-
return `${fieldType.nullable ? `null | ` : ""}${type}${l.isArray ? "[]" : ""}`;
|
|
105
106
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
exports.
|
|
107
|
+
return `${fieldType.nullable ? `null | ` : ""}${type}${l.isArray ? "[]" : ""}`;
|
|
108
|
+
}
|
|
109
|
+
else
|
|
110
|
+
throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType }, null, 2);
|
|
111
|
+
};
|
|
112
|
+
exports.getJSONBTSTypes = getJSONBTSTypes;
|
|
112
113
|
const isValidIdentifier = (str) => {
|
|
113
114
|
const identifierRegex = /^[A-Za-z$_][A-Za-z0-9$_]*$/;
|
|
114
115
|
return identifierRegex.test(str);
|