prostgles-server 4.2.265 → 4.2.267
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/TableHandler/DataValidator.js +5 -5
- package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js +1 -2
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.js +2 -2
- package/dist/DboBuilder/TableHandler/insertTest.js.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +1 -2
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +1 -2
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- 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/parseComplexFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js +6 -8
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js.map +1 -1
- 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/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +1 -2
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +2 -2
- package/dist/DboBuilder/getSubscribeRelatedTables.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 +98 -97
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.js.map +1 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js +3 -3
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js.map +1 -1
- package/dist/Logging.d.ts +2 -1
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +7 -44
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +7 -38
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.d.ts +22 -0
- package/dist/PubSubManager/PubSubManagerUtils.d.ts.map +1 -0
- package/dist/PubSubManager/PubSubManagerUtils.js +33 -0
- package/dist/PubSubManager/PubSubManagerUtils.js.map +1 -0
- package/dist/PubSubManager/addSub.d.ts +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +20 -24
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/addSync.d.ts.map +1 -1
- package/dist/PubSubManager/addSync.js +3 -3
- package/dist/PubSubManager/addSync.js.map +1 -1
- package/dist/PubSubManager/addTrigger.d.ts +1 -1
- package/dist/PubSubManager/addTrigger.d.ts.map +1 -1
- package/dist/PubSubManager/addTrigger.js +9 -9
- package/dist/PubSubManager/addTrigger.js.map +1 -1
- package/dist/PubSubManager/deleteOrphanedTriggers.d.ts.map +1 -1
- package/dist/PubSubManager/deleteOrphanedTriggers.js +2 -2
- package/dist/PubSubManager/deleteOrphanedTriggers.js.map +1 -1
- package/dist/PubSubManager/getPubSubManagerInitQuery.d.ts.map +1 -1
- package/dist/PubSubManager/getPubSubManagerInitQuery.js +26 -23
- package/dist/PubSubManager/getPubSubManagerInitQuery.js.map +1 -1
- package/dist/PubSubManager/initPubSubManager.d.ts +1 -1
- package/dist/PubSubManager/initPubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/initPubSubManager.js +3 -3
- package/dist/PubSubManager/initPubSubManager.js.map +1 -1
- package/dist/PubSubManager/initialiseEventTriggers.d.ts +1 -1
- package/dist/PubSubManager/initialiseEventTriggers.d.ts.map +1 -1
- package/dist/PubSubManager/initialiseEventTriggers.js +2 -2
- package/dist/PubSubManager/initialiseEventTriggers.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +20 -14
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/orphanTriggerCheck.d.ts.map +1 -1
- package/dist/PubSubManager/orphanTriggerCheck.js +2 -2
- package/dist/PubSubManager/orphanTriggerCheck.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts +1 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js +3 -3
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js +2 -2
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js +4 -5
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/dist/SyncReplication.d.ts +1 -1
- package/dist/SyncReplication.d.ts.map +1 -1
- package/dist/SyncReplication.js +7 -7
- package/dist/SyncReplication.js.map +1 -1
- package/dist/TableConfig/applyTableConfig.js +2 -2
- package/dist/TableConfig/applyTableConfig.js.map +1 -1
- package/dist/TableConfig/getColumnDefinitionQuery.js +7 -7
- package/dist/TableConfig/getColumnDefinitionQuery.js.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.js +4 -4
- package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
- package/dist/TableConfig/getSchemaDiffQueries.js +2 -2
- package/dist/TableConfig/getSchemaDiffQueries.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +5 -5
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/dist/TableConfig/runMigrations.js +2 -2
- package/dist/TableConfig/runMigrations.js.map +1 -1
- package/dist/TableConfig/tableConfigSchemaUtils.js +3 -3
- package/dist/TableConfig/tableConfigSchemaUtils.js.map +1 -1
- package/lib/DboBuilder/TableHandler/DataValidator.ts +1 -1
- package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts +1 -1
- package/lib/DboBuilder/TableHandler/insertTest.ts +1 -1
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +1 -2
- package/lib/DboBuilder/TableHandler/updateFile.ts +1 -2
- package/lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts +72 -0
- package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +7 -13
- package/lib/DboBuilder/ViewHandler/subscribe.ts +9 -6
- package/lib/DboBuilder/dboBuilderUtils.ts +1 -1
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +2 -1
- package/lib/JSONBValidation/JSONBValidation.spec.ts +38 -3
- package/lib/JSONBValidation/JSONBValidation.ts +102 -15
- package/lib/JSONBValidation/getJSONBSchemaTSTypes.ts +111 -111
- package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +3 -3
- package/lib/Logging.ts +2 -1
- package/lib/PubSubManager/PubSubManager.ts +11 -50
- package/lib/PubSubManager/PubSubManagerUtils.ts +37 -0
- package/lib/PubSubManager/addSub.ts +21 -30
- package/lib/PubSubManager/addSync.ts +2 -7
- package/lib/PubSubManager/addTrigger.ts +3 -2
- package/lib/PubSubManager/deleteOrphanedTriggers.ts +2 -1
- package/lib/PubSubManager/getPubSubManagerInitQuery.ts +29 -39
- package/lib/PubSubManager/initPubSubManager.ts +2 -1
- package/lib/PubSubManager/initialiseEventTriggers.ts +3 -2
- package/lib/PubSubManager/notifListener.ts +20 -6
- package/lib/PubSubManager/orphanTriggerCheck.ts +2 -1
- package/lib/PubSubManager/pushSubData.ts +3 -2
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +1 -1
- package/lib/SchemaWatch/SchemaWatch.ts +2 -5
- package/lib/SyncReplication.ts +3 -2
- package/lib/TableConfig/applyTableConfig.ts +2 -2
- package/lib/TableConfig/getColumnDefinitionQuery.ts +1 -1
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +1 -1
- package/lib/TableConfig/getSchemaDiffQueries.ts +1 -1
- package/lib/TableConfig/initTableConfig.ts +7 -4
- package/lib/TableConfig/runMigrations.ts +2 -2
- package/lib/TableConfig/tableConfigSchemaUtils.ts +2 -2
- package/package.json +2 -2
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSubscribeRelatedTables = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
6
5
|
const DboBuilder_1 = require("./DboBuilder");
|
|
6
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
7
7
|
/**
|
|
8
8
|
* When subscribing to a view: we identify underlying tables to subscribe to them
|
|
9
9
|
* When subscribing to a table: we identify joined tables to subscribe to them
|
|
@@ -86,7 +86,7 @@ async function getSubscribeRelatedTables({ filter, localParams, newQuery }) {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
catch (e) {
|
|
89
|
-
(0,
|
|
89
|
+
(0, PubSubManagerUtils_1.log)(`Could not not override subscribed view (${this.name}) table (${tableName}). Will not check condition`, e);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":";;;AAAA,qDAMyB;
|
|
1
|
+
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.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":"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"}
|
|
@@ -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
|
-
const
|
|
6
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
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, PubSubManagerUtils_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, PubSubManagerUtils_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);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJSONBSchemaTSTypes.js","sourceRoot":"","sources":["../../lib/JSONBValidation/getJSONBSchemaTSTypes.ts"],"names":[],"mappings":";;;AAAA,qDAAkF;AAClF,yDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"getJSONBSchemaTSTypes.js","sourceRoot":"","sources":["../../lib/JSONBValidation/getJSONBSchemaTSTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validate_jsonb_schema_sql = exports.JSONB_DATA_TYPES = exports.VALIDATE_SCHEMA_FUNCNAME = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const
|
|
5
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
6
|
const raiseException = (err) => `
|
|
7
7
|
IF (context->'silent')::BOOLEAN = TRUE THEN
|
|
8
8
|
RETURN FALSE;
|
|
@@ -15,7 +15,7 @@ exports.JSONB_DATA_TYPES = [...prostgles_types_1.DATA_TYPES, "Lookup", "Lookup[]
|
|
|
15
15
|
exports.validate_jsonb_schema_sql = `
|
|
16
16
|
|
|
17
17
|
/*
|
|
18
|
-
* ${
|
|
18
|
+
* ${PubSubManagerUtils_1.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
19
19
|
*/
|
|
20
20
|
|
|
21
21
|
CREATE OR REPLACE FUNCTION ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
@@ -402,7 +402,7 @@ BEGIN
|
|
|
402
402
|
END;
|
|
403
403
|
$f$ LANGUAGE 'plpgsql' IMMUTABLE;
|
|
404
404
|
|
|
405
|
-
COMMENT ON FUNCTION ${exports.VALIDATE_SCHEMA_FUNCNAME} /* ${
|
|
405
|
+
COMMENT ON FUNCTION ${exports.VALIDATE_SCHEMA_FUNCNAME} /* ${PubSubManagerUtils_1.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */
|
|
406
406
|
IS $$prostgles-server internal function used in column CHECK conditions to validate jsonb data against a column schema specified in tableConfig.
|
|
407
407
|
Example usage:
|
|
408
408
|
validate_jsonb_schema(
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,4EAAyF;AAEzF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC;;;;oBAIpB,GAAG;;CAEtB,CAAC;AAEW,QAAA,wBAAwB,GAAG,uBAAuB,CAAC;AACnD,QAAA,gBAAgB,GAAG,CAAC,GAAG,4BAAU,EAAE,QAAQ,EAAE,UAAU,CAAU,CAAC;AAElE,QAAA,yBAAyB,GAAG;;;IAGrC,uDAAkC;;;6BAGT,gCAAwB;;;;;;;;;;;;;6BAaxB,wBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAoDjD,cAAc,CAAC,yBAAyB,CAAC;;;;;;;;;;;;;MAazC,cAAc,CAAC,2GAA2G,CAAC;;;;;;;QAOzH,cAAc,CAAC,4BAA4B,CAAC;;;;;;;;;;;QAW5C,cAAc,CAAC,8EAA8E,CAAC;;;;QAI9F,cAAc,CAAC,8DAA8D,CAAC;;;;;;;;;;;aAWzE,gCAAwB;;;;;;;;;;aAUxB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;UAwB3B,cAAc,CAAC,yEAAyE,CAAC;;;;;;;;;YASvF,cAAc,CAAC,mDAAmD,CAAC;;;;;;;mBAO5D,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;YAyB/B,cAAc,CAAC,wFAAwF,CAAC;;;;;;;;cAQtG,cAAc,CAAC,iHAAiH,CAAC;;;;;;;;cAQjI,cAAc,CAAC,oIAAoI,CAAC;;;YAGtJ,cAAc,CAAC,oEAAoE,CAAC;;;;;;;;;;UAUtF,cAAc,CAAC,oCAAoC,CAAC;;;;;;;;;;UAUpD,cAAc,CAAC,2HAA2H,CAAC;;;;;;;;;;;cAWvI,cAAc,CAAC,oFAAoF,CAAC;;;oBAG9F,gCAAwB;;;;;;;;;;;;;;QAcpC,cAAc,CAAC,sEAAsE,CAAC;;;;;;;;;QAStF,cAAc,CAAC,iGAAiG,CAAC;;;;;;;;;;;aAW5G,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuC/B,cAAc,CAAC,gEAAgE,CAAC;;;;;;;;QAQ9E,cAAc,CAAC,4BAA4B,CAAC;;;;;;;eAOrC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;QAuB/B,cAAc,CAAC,kIAAkI,CAAC;;;;QAIlJ,cAAc,CAAC,6BAA6B,CAAC;;;;;;;6EAOwB,gCAAwB;;;;;;;oEAOjC,gCAAwB;;;;;;;;;MAStF,cAAc,CAAC,yCAAyC,CAAC;;;;;;;sBAOzC,gCAAwB,QAAQ,uDAAkC;;;;;;;;;;;;SAY/E,gCAAwB;;;;;;SAMxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;SAIxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;;;;;;;;;;;;SAgBxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;SAExB,gCAAwB;;SAExB,gCAAwB;;;SAGxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;;SAExB,gCAAwB;SACxB,gCAAwB;;;SAGxB,gCAAwB;CAChC,CAAC"}
|
package/dist/Logging.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import { LocalParams } from "./DboBuilder/DboBuilder";
|
|
3
|
-
import {
|
|
3
|
+
import { PubSubManagerTriggers } from "./PubSubManager/PubSubManager";
|
|
4
|
+
import type { NotifTypeName } from "./PubSubManager/PubSubManagerUtils";
|
|
4
5
|
type ClientInfo = {
|
|
5
6
|
socketId: string | undefined;
|
|
6
7
|
sid: string | undefined;
|