prostgles-server 3.0.90 → 3.0.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DBSchemaBuilder.js +1 -2
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.d.ts.map +1 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js +28 -14
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js.map +1 -1
- package/dist/JSONBValidation/validation.d.ts +34 -13
- package/dist/JSONBValidation/validation.d.ts.map +1 -1
- package/dist/JSONBValidation/validation.js +45 -54
- package/dist/JSONBValidation/validation.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +13 -11
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/lib/DBSchemaBuilder.js +1 -2
- package/lib/DBSchemaBuilder.ts +2 -2
- package/lib/JSONBValidation/validate_jsonb_schema_sql.d.ts.map +1 -1
- package/lib/JSONBValidation/validate_jsonb_schema_sql.js +28 -14
- package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +28 -14
- package/lib/JSONBValidation/validation.d.ts +34 -13
- package/lib/JSONBValidation/validation.d.ts.map +1 -1
- package/lib/JSONBValidation/validation.js +45 -54
- package/lib/JSONBValidation/validation.ts +85 -66
- package/lib/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/lib/PubSubManager/PubSubManager.js +13 -11
- package/lib/PubSubManager/PubSubManager.ts +14 -13
- package/lib/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.ts +1 -1
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/client_only_queries.js +1 -1
- package/tests/client_only_queries.ts +1 -1
- package/tests/server/DBoGenerated.d.ts +29 -8
- package/tests/server/index.js +4 -4
- package/tests/server/index.ts +4 -4
- package/tests/server/package-lock.json +1 -1
package/dist/DBSchemaBuilder.js
CHANGED
|
@@ -15,8 +15,7 @@ const getDBSchema = (dboBuilder) => {
|
|
|
15
15
|
const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
|
|
16
16
|
if (colConf) {
|
|
17
17
|
if ((0, prostgles_types_1.isObject)(colConf) && (colConf.jsonbSchema || colConf.jsonbSchemaType)) {
|
|
18
|
-
const schema = colConf.jsonbSchema
|
|
19
|
-
// if(!colConf.jsonbSchema) throw "colConf.jsonbSchema missing";
|
|
18
|
+
const schema = colConf.jsonbSchema || { ...colConf, type: colConf.jsonbSchemaType };
|
|
20
19
|
type = (0, validation_1.getJSONBSchemaTSTypes)(schema, { nullable: colConf.nullable }, " ");
|
|
21
20
|
}
|
|
22
21
|
else if ((0, prostgles_types_1.isObject)(colConf) && "enum" in colConf) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":";;;AAAA,qDAAgF;AAChF,wBAA0B;AAE1B,6CAA4F;AAE5F,6DAA4E;AAGrE,MAAM,WAAW,GAAG,CAAC,UAAsB,EAAU,EAAE;IAC5D,MAAM,MAAM,GAAa,EAAE,CAAC;IAG5B,kFAAkF;IAClF,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC5F,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,CAAC,CAAsB,EAAE,EAAE;YAC5C,IAAI,IAAI,GAAW,CAAC,CAAC,CAAC,WAAW,CAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAA,6BAAgB,EAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;YACvF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1F,IAAG,OAAO,EAAC;gBACT,IAAG,IAAA,0BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC,EAAC;oBACvE,MAAM,MAAM,GAAsB,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,mCAA6C,CAAC;AACnF,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,mCAA6C,CAAC;AACnF,eAAO,MAAM,yBAAyB,QA+SrC,CAAC"}
|
|
@@ -17,6 +17,8 @@ DECLARE
|
|
|
17
17
|
optional boolean;
|
|
18
18
|
nullable boolean;
|
|
19
19
|
colname TEXT;
|
|
20
|
+
oneof JSONB;
|
|
21
|
+
arrayof JSONB;
|
|
20
22
|
|
|
21
23
|
extra_keys TEXT[];
|
|
22
24
|
BEGIN
|
|
@@ -179,15 +181,18 @@ BEGIN
|
|
|
179
181
|
RAISE EXCEPTION 'Unexpected schema.type ( % ), %',jsonb_typeof(schema->'type'), path USING HINT = path, COLUMN = colname;
|
|
180
182
|
END IF;
|
|
181
183
|
|
|
182
|
-
/*
|
|
183
|
-
ELSIF schema ? 'oneOf' THEN
|
|
184
|
-
|
|
185
|
-
|
|
184
|
+
/* oneOfType: [{ key_name: { type: "string" } }] */
|
|
185
|
+
ELSIF (schema ? 'oneOf' OR schema ? 'oneOfType') THEN
|
|
186
|
+
|
|
187
|
+
oneof = COALESCE(schema->'oneOf', schema->'oneOfType');
|
|
188
|
+
|
|
189
|
+
IF jsonb_typeof(oneof) != 'array' THEN
|
|
190
|
+
RAISE EXCEPTION 'Unexpected oneOf schema. Expecting an array of objects but received: % , %', oneof::TEXT, path USING HINT = path, COLUMN = colname;
|
|
186
191
|
END IF;
|
|
187
192
|
|
|
188
193
|
FOR sub_schema IN
|
|
189
|
-
SELECT jsonb_build_object('type', value) as value
|
|
190
|
-
FROM jsonb_array_elements(
|
|
194
|
+
SELECT CASE WHEN schema ? 'oneOfType' THEN jsonb_build_object('type', value) ELSE value END as value
|
|
195
|
+
FROM jsonb_array_elements(oneof)
|
|
191
196
|
LOOP
|
|
192
197
|
|
|
193
198
|
BEGIN
|
|
@@ -205,12 +210,15 @@ BEGIN
|
|
|
205
210
|
END;
|
|
206
211
|
END LOOP;
|
|
207
212
|
|
|
208
|
-
RAISE EXCEPTION 'Could not validate against any oneOf schemas ( % ), %',
|
|
213
|
+
RAISE EXCEPTION 'Could not validate against any oneOf schemas ( % ), %', oneof::TEXT, path USING HINT = path, COLUMN = colname;
|
|
214
|
+
|
|
215
|
+
/* arrayOfType: { key_name: { type: "string" } } */
|
|
216
|
+
ELSIF (schema ? 'arrayOf' OR schema ? 'arrayOfType') THEN
|
|
217
|
+
|
|
218
|
+
arrayof = COALESCE(schema->'arrayOf', schema->'arrayOfType');
|
|
209
219
|
|
|
210
|
-
/* arrayOf: { key_name: { type: "string" } } */
|
|
211
|
-
ELSIF jsonb_typeof(schema->'arrayOf') = 'object' THEN
|
|
212
220
|
IF jsonb_typeof(data) != 'array' THEN
|
|
213
|
-
RAISE EXCEPTION '
|
|
221
|
+
RAISE EXCEPTION '% is not an array.', path USING HINT = path, COLUMN = colname;
|
|
214
222
|
END IF;
|
|
215
223
|
|
|
216
224
|
FOR array_element IN
|
|
@@ -218,7 +226,13 @@ BEGIN
|
|
|
218
226
|
FROM jsonb_array_elements(data)
|
|
219
227
|
LOOP
|
|
220
228
|
IF NOT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
221
|
-
(
|
|
229
|
+
( CASE WHEN schema ? 'arrayOf'
|
|
230
|
+
THEN
|
|
231
|
+
schema->'arrayOf'
|
|
232
|
+
ELSE
|
|
233
|
+
(schema - 'arrayOfType' || jsonb_build_object('type', schema->'arrayOfType'))
|
|
234
|
+
END
|
|
235
|
+
)::TEXT,
|
|
222
236
|
array_element.value, checked_path || array_element.idx::TEXT
|
|
223
237
|
) THEN
|
|
224
238
|
RETURN false;
|
|
@@ -256,7 +270,7 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
|
256
270
|
|
|
257
271
|
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
258
272
|
'{
|
|
259
|
-
"
|
|
273
|
+
"oneOfType": [
|
|
260
274
|
{ "a": "string" } ,
|
|
261
275
|
{
|
|
262
276
|
"a": {
|
|
@@ -271,7 +285,7 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
|
271
285
|
);
|
|
272
286
|
|
|
273
287
|
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
274
|
-
'{ "
|
|
288
|
+
'{ "arrayOfType": { "a": "string", "narr": { "arrayOfType": { "a": { "type": "string", "optional": false, "nullable": true } } } } }',
|
|
275
289
|
'[{ "a": "ddd", "narr": [{ "a": null }] }]'::JSONB
|
|
276
290
|
);
|
|
277
291
|
|
|
@@ -289,7 +303,7 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "type": "any"}', '{}');
|
|
|
289
303
|
|
|
290
304
|
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "type": { "a": { "enum": ["a"] } } }', '{ "a": "a"}');
|
|
291
305
|
|
|
292
|
-
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "
|
|
306
|
+
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "arrayOfType": { "a": { "enum": ["a"] } } }', '[{ "a": "a"}]');
|
|
293
307
|
|
|
294
308
|
`;
|
|
295
309
|
//# sourceMappingURL=validate_jsonb_schema_sql.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAEa,QAAA,wBAAwB,GAAG,iCAA0C,CAAC;AACtE,QAAA,yBAAyB,GAAG;0BACf,gCAAwB;;6BAErB,gCAAwB
|
|
1
|
+
{"version":3,"file":"validate_jsonb_schema_sql.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validate_jsonb_schema_sql.ts"],"names":[],"mappings":";;;AAEa,QAAA,wBAAwB,GAAG,iCAA0C,CAAC;AACtE,QAAA,yBAAyB,GAAG;0BACf,gCAAwB;;6BAErB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAiFlC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiF1B,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA8B5B,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA4BtB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;sBAsBjB,gCAAwB;;;;;;;;;;;SAWrC,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;;;;;;;;;;;;SAgBxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;SAExB,gCAAwB;;SAExB,gCAAwB;;CAEhC,CAAC"}
|
|
@@ -19,42 +19,60 @@ export declare namespace JSONB {
|
|
|
19
19
|
type: DataType;
|
|
20
20
|
allowedValues?: any[];
|
|
21
21
|
oneOf?: undefined;
|
|
22
|
+
oneOfType?: undefined;
|
|
22
23
|
arrayOf?: undefined;
|
|
24
|
+
arrayOfType?: undefined;
|
|
23
25
|
enum?: undefined;
|
|
24
26
|
};
|
|
25
27
|
export type ObjectType = BaseOptions & {
|
|
26
28
|
type: ObjectSchema;
|
|
27
29
|
allowedValues?: undefined;
|
|
28
30
|
oneOf?: undefined;
|
|
31
|
+
oneOfType?: undefined;
|
|
29
32
|
arrayOf?: undefined;
|
|
33
|
+
arrayOfType?: undefined;
|
|
30
34
|
enum?: undefined;
|
|
31
35
|
};
|
|
32
36
|
export type EnumType = BaseOptions & {
|
|
33
37
|
type?: undefined;
|
|
34
38
|
enum: readonly any[];
|
|
35
39
|
oneOf?: undefined;
|
|
40
|
+
oneOfType?: undefined;
|
|
36
41
|
arrayOf?: undefined;
|
|
42
|
+
arrayOfType?: undefined;
|
|
37
43
|
allowedValues?: undefined;
|
|
38
44
|
};
|
|
39
45
|
export type OneOf = BaseOptions & {
|
|
40
46
|
type?: undefined;
|
|
41
|
-
oneOf: readonly ObjectSchema[];
|
|
42
47
|
arrayOf?: undefined;
|
|
48
|
+
arrayOfType?: undefined;
|
|
43
49
|
allowedValues?: undefined;
|
|
44
50
|
enum?: undefined;
|
|
45
|
-
}
|
|
51
|
+
} & ({
|
|
52
|
+
oneOf?: undefined;
|
|
53
|
+
oneOfType: readonly ObjectSchema[];
|
|
54
|
+
} | {
|
|
55
|
+
oneOf: FieldType[];
|
|
56
|
+
oneOfType?: undefined;
|
|
57
|
+
});
|
|
46
58
|
export type ArrayOf = BaseOptions & {
|
|
47
59
|
type?: undefined;
|
|
48
|
-
arrayOf: ObjectSchema;
|
|
49
60
|
allowedValues?: undefined;
|
|
50
61
|
oneOf?: undefined;
|
|
62
|
+
oneOfType?: undefined;
|
|
51
63
|
enum?: undefined;
|
|
52
|
-
}
|
|
53
|
-
|
|
64
|
+
} & ({
|
|
65
|
+
arrayOf?: undefined;
|
|
66
|
+
arrayOfType: ObjectSchema;
|
|
67
|
+
} | {
|
|
68
|
+
arrayOf: FieldType;
|
|
69
|
+
arrayOfType?: undefined;
|
|
70
|
+
});
|
|
71
|
+
export type FieldTypeObj = StrictUnion<BasicType | ObjectType | EnumType | OneOf | ArrayOf>;
|
|
54
72
|
export type FieldType = DataType | FieldTypeObj;
|
|
55
73
|
export type GetType<T extends FieldType | Omit<FieldTypeObj, "optional">> = T extends {
|
|
56
74
|
type: ObjectSchema;
|
|
57
|
-
} ?
|
|
75
|
+
} ? GetObjectType<T["type"]> : T extends "number" | {
|
|
58
76
|
type: "number";
|
|
59
77
|
} ? number : T extends "boolean" | {
|
|
60
78
|
type: "boolean";
|
|
@@ -75,18 +93,22 @@ export declare namespace JSONB {
|
|
|
75
93
|
} ? string[] : T extends "any[]" | {
|
|
76
94
|
type: "any[]";
|
|
77
95
|
} ? any[] : T extends {
|
|
78
|
-
enum: readonly any[];
|
|
96
|
+
"enum": readonly any[];
|
|
79
97
|
} ? T["enum"][number] : T extends {
|
|
98
|
+
oneOf: FieldType[];
|
|
99
|
+
} ? StrictUnion<GetType<T["oneOf"][number]>> : T extends {
|
|
80
100
|
oneOf: readonly ObjectSchema[];
|
|
81
|
-
} ? StrictUnion<
|
|
101
|
+
} ? StrictUnion<GetType<T["oneOf"][number]>> : T extends {
|
|
82
102
|
arrayOf: ObjectSchema;
|
|
83
|
-
} ?
|
|
103
|
+
} ? GetType<T["arrayOf"]>[] : T extends {
|
|
104
|
+
arrayOfType: ObjectSchema;
|
|
105
|
+
} ? GetType<T["arrayOfType"]>[] : any;
|
|
84
106
|
type IsOptional<F extends FieldType> = F extends DataType ? false : F extends {
|
|
85
107
|
optional: true;
|
|
86
108
|
} ? true : false;
|
|
87
109
|
export type ObjectSchema = Record<string, FieldType>;
|
|
88
110
|
export type JSONBSchema = Omit<FieldTypeObj, "optional">;
|
|
89
|
-
export type
|
|
111
|
+
export type GetObjectType<S extends ObjectSchema> = ({
|
|
90
112
|
[K in keyof S as IsOptional<S[K]> extends true ? K : never]?: GetType<S[K]>;
|
|
91
113
|
} & {
|
|
92
114
|
[K in keyof S as IsOptional<S[K]> extends true ? never : K]: GetType<S[K]>;
|
|
@@ -95,12 +117,11 @@ export declare namespace JSONB {
|
|
|
95
117
|
export {};
|
|
96
118
|
}
|
|
97
119
|
export declare function validate<T>(obj: T, key: keyof T, rawFieldType: JSONB.FieldType): boolean;
|
|
98
|
-
export declare function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSONB.
|
|
120
|
+
export declare function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSONB.GetObjectType<S>, objName?: string, optional?: boolean): void;
|
|
99
121
|
type ColOpts = {
|
|
100
122
|
nullable?: boolean;
|
|
101
123
|
};
|
|
102
|
-
export declare function
|
|
103
|
-
export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading?: string, isOneOf?: boolean): string;
|
|
124
|
+
export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading?: string): string;
|
|
104
125
|
export declare function getJSONBSchemaAsJSONSchema(tableName: string, colName: string, columnConfig: BaseColumn<{
|
|
105
126
|
en: 1;
|
|
106
127
|
}> & JSONBColumnDef): JSONSchema7;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAC;AAGpE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIzE,QAAA,MAAM,UAAU,kIAGN,CAAC;AACX,KAAK,QAAQ,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAE1C,yBAAiB,KAAK,CAAC;IAErB,MAAM,MAAM,WAAW,GAAG;QACxB;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;QACpC,IAAI,EAAE,QAAQ,CAAC;QACf,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;QACtB,KAAK,CAAC,EAAE,SAAS,CAAC;QAClB,OAAO,CAAC,EAAE,SAAS,CAAC;QACpB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,CAAC;IAEF,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;QACrC,IAAI,EAAE,YAAY,CAAC;QACnB,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,KAAK,CAAC,EAAE,SAAS,CAAC;QAClB,OAAO,CAAC,EAAE,SAAS,CAAC;QACpB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,CAAA;IAED,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG;QACnC,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,CAAC,EAAE,SAAS,CAAC;QAClB,OAAO,CAAC,EAAE,SAAS,CAAC;QACpB,aAAa,CAAC,EAAE,SAAS,CAAC;KAC3B,CAAC;IAEF,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG;QAChC,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getJSONBSchemaAsJSONSchema = exports.getJSONBSchemaTSTypes = exports.
|
|
3
|
+
exports.getJSONBSchemaAsJSONSchema = exports.getJSONBSchemaTSTypes = exports.validateSchema = exports.validate = exports.JSONB = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
6
6
|
const PrimitiveTypes = ["boolean", "number", "integer", "string", "any"];
|
|
@@ -8,14 +8,21 @@ const DATA_TYPES = [
|
|
|
8
8
|
...PrimitiveTypes,
|
|
9
9
|
...PrimitiveTypes.map(v => `${v}[]`)
|
|
10
10
|
];
|
|
11
|
+
var JSONB;
|
|
12
|
+
(function (JSONB) {
|
|
13
|
+
const dd = {
|
|
14
|
+
enum: [1],
|
|
15
|
+
type: "any"
|
|
16
|
+
};
|
|
17
|
+
})(JSONB = exports.JSONB || (exports.JSONB = {}));
|
|
11
18
|
/** tests */
|
|
12
19
|
const s = {
|
|
13
20
|
type: {
|
|
14
21
|
a: { type: "boolean" },
|
|
15
22
|
c: { type: { c1: { type: "string" } } },
|
|
16
|
-
arr: {
|
|
23
|
+
arr: { arrayOfType: { d: "string" } },
|
|
17
24
|
o: {
|
|
18
|
-
|
|
25
|
+
oneOfType: [
|
|
19
26
|
{ z: { type: "integer" } },
|
|
20
27
|
{ z1: { type: "integer" } }
|
|
21
28
|
]
|
|
@@ -69,68 +76,51 @@ function validateSchema(schema, obj, objName, optional = false) {
|
|
|
69
76
|
(0, prostgles_types_1.getKeys)(schema).forEach(k => validate(obj, k, schema[k]));
|
|
70
77
|
}
|
|
71
78
|
exports.validateSchema = validateSchema;
|
|
72
|
-
function
|
|
73
|
-
const getFieldType = (rawFieldType) => {
|
|
79
|
+
function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
|
|
80
|
+
const getFieldType = (rawFieldType, isOneOf = false) => {
|
|
74
81
|
const fieldType = getFieldTypeObj(rawFieldType);
|
|
75
82
|
const nullType = (fieldType.nullable ? `null | ` : "");
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
return nullType + correctType;
|
|
83
|
+
/** Primitives */
|
|
84
|
+
if (typeof fieldType?.type === "string") {
|
|
85
|
+
const correctType = fieldType.type.replace("integer", "number");
|
|
86
|
+
if (fieldType.allowedValues && fieldType.type.endsWith("[]")) {
|
|
87
|
+
return nullType + ` (${fieldType.allowedValues.map(v => JSON.stringify(v)).join(" | ")})[]`;
|
|
83
88
|
}
|
|
84
|
-
|
|
85
|
-
|
|
89
|
+
return nullType + correctType;
|
|
90
|
+
/** Object */
|
|
91
|
+
}
|
|
92
|
+
else if ((0, prostgles_types_1.isObject)(fieldType.type)) {
|
|
93
|
+
const { type } = fieldType;
|
|
94
|
+
const spacing = isOneOf ? " " : " ";
|
|
95
|
+
let objDef = `${leading}{ \n` + (0, prostgles_types_1.getKeys)(type).map(k => {
|
|
96
|
+
const fieldType = getFieldTypeObj(type[k]);
|
|
97
|
+
return `${leading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType) + ";";
|
|
98
|
+
}).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
|
|
99
|
+
/** Keep single line */
|
|
100
|
+
if (isOneOf) {
|
|
101
|
+
objDef = objDef.split("\n").join("");
|
|
86
102
|
}
|
|
103
|
+
return nullType + objDef;
|
|
87
104
|
}
|
|
88
105
|
else if (fieldType?.enum) {
|
|
89
106
|
return nullType + fieldType.enum.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
|
|
90
107
|
}
|
|
91
|
-
else if (fieldType?.oneOf) {
|
|
92
|
-
|
|
108
|
+
else if (fieldType?.oneOf || fieldType?.oneOfType) {
|
|
109
|
+
const oneOf = fieldType?.oneOf || fieldType?.oneOfType.map(type => ({ type }));
|
|
110
|
+
return (fieldType.nullable ? `\n${leading} | null` : "") + oneOf.map(v => `\n${leading} | ` + getFieldType(v)).join("");
|
|
93
111
|
}
|
|
94
|
-
else if (fieldType?.arrayOf) {
|
|
95
|
-
|
|
112
|
+
else if (fieldType?.arrayOf || fieldType?.arrayOfType) {
|
|
113
|
+
const arrayOf = fieldType?.arrayOf || { type: fieldType?.arrayOfType };
|
|
114
|
+
return (fieldType.nullable ? `\n${leading} | null` : "") + getFieldType(arrayOf) + "[]";
|
|
96
115
|
}
|
|
97
116
|
else
|
|
98
117
|
throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2);
|
|
99
118
|
};
|
|
100
|
-
|
|
101
|
-
const res = `${leading}{ \n` + (0, prostgles_types_1.getKeys)(schema).map(k => {
|
|
102
|
-
const fieldType = getFieldTypeObj(schema[k]);
|
|
103
|
-
return `${leading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType) + ";";
|
|
104
|
-
}).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
|
|
105
|
-
/** Keep single line */
|
|
106
|
-
if (isOneOf)
|
|
107
|
-
return res.split("\n").join("");
|
|
108
|
-
return res;
|
|
109
|
-
}
|
|
110
|
-
exports.getSchemaTSTypes = getSchemaTSTypes;
|
|
111
|
-
function getJSONBSchemaTSTypes(schema, colOpts, leading = "", isOneOf = false) {
|
|
112
|
-
if (schema.arrayOf) {
|
|
113
|
-
return (colOpts.nullable ? `\n${leading} | null` : "") + getSchemaTSTypes(schema.arrayOf, leading, isOneOf) + "[]";
|
|
114
|
-
}
|
|
115
|
-
else if (schema.enum) {
|
|
116
|
-
return (colOpts.nullable ? `\n${leading} | null` : "") + schema.enum.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
|
|
117
|
-
}
|
|
118
|
-
else if (schema.oneOf) {
|
|
119
|
-
return (colOpts.nullable ? `\n${leading} | null` : "") + schema.oneOf.map(s => `\n${leading} | ` + getSchemaTSTypes(s, "", true)).join("");
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
if (typeof schema.type === "string") {
|
|
123
|
-
return (colOpts.nullable ? `null | ` : "") + schema.type;
|
|
124
|
-
}
|
|
125
|
-
else if (schema.type) {
|
|
126
|
-
return (colOpts.nullable ? `null | ` : "") + getSchemaTSTypes(schema.type, leading, isOneOf);
|
|
127
|
-
}
|
|
128
|
-
return "";
|
|
129
|
-
}
|
|
119
|
+
return getFieldType({ ...schema, nullable: colOpts.nullable });
|
|
130
120
|
}
|
|
131
121
|
exports.getJSONBSchemaTSTypes = getJSONBSchemaTSTypes;
|
|
132
122
|
const getJSONSchemaObject = (rawType, rootInfo) => {
|
|
133
|
-
const { type, arrayOf, description, nullable, oneOf, title, ...t } = typeof rawType === "string" ? ({ type: rawType }) :
|
|
123
|
+
const { type, arrayOf, arrayOfType, description, nullable, oneOf, oneOfType, title, ...t } = typeof rawType === "string" ? ({ type: rawType }) :
|
|
134
124
|
rawType;
|
|
135
125
|
let result = {};
|
|
136
126
|
const partialProps = {
|
|
@@ -141,13 +131,13 @@ const getJSONSchemaObject = (rawType, rootInfo) => {
|
|
|
141
131
|
if (t.enum?.length) {
|
|
142
132
|
partialProps.type = typeof t.enum[0];
|
|
143
133
|
}
|
|
144
|
-
if (typeof type === "string" || arrayOf) {
|
|
134
|
+
if (typeof type === "string" || arrayOf || arrayOfType) {
|
|
145
135
|
/** ARRAY */
|
|
146
136
|
if (type && typeof type !== "string") {
|
|
147
137
|
throw "Not expected";
|
|
148
138
|
}
|
|
149
|
-
if (arrayOf || type?.endsWith("[]")) {
|
|
150
|
-
const arrayItems = arrayOf ? getJSONSchemaObject({ type:
|
|
139
|
+
if (arrayOf || arrayOfType || type?.endsWith("[]")) {
|
|
140
|
+
const arrayItems = (arrayOf || arrayOfType) ? getJSONSchemaObject(arrayOf || { type: arrayOfType }) :
|
|
151
141
|
type?.startsWith("any") ? { type: undefined } :
|
|
152
142
|
{
|
|
153
143
|
type: type?.slice(0, -2),
|
|
@@ -181,10 +171,11 @@ const getJSONSchemaObject = (rawType, rootInfo) => {
|
|
|
181
171
|
}, {}),
|
|
182
172
|
};
|
|
183
173
|
}
|
|
184
|
-
else if (oneOf) {
|
|
174
|
+
else if (oneOf || oneOfType) {
|
|
175
|
+
const _oneOf = oneOf || oneOfType.map(type => ({ type }));
|
|
185
176
|
result = {
|
|
186
177
|
type: "object",
|
|
187
|
-
oneOf:
|
|
178
|
+
oneOf: _oneOf.map(t => getJSONSchemaObject(t))
|
|
188
179
|
};
|
|
189
180
|
}
|
|
190
181
|
if (nullable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":";;;AACA,qDAA6D;AAC7D,kEAAyD;AAIzD,MAAM,cAAc,GAAG,CAAC,SAAS,EAAG,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAU,CAAC;AACnF,MAAM,UAAU,GAAG;IACjB,GAAG,cAAc;IACjB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAuB,CAAC;CAC/C,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAc,MAAM,eAAe,CAAC;AAClH,OAAO,EAAE,EAAE,EAAe,MAAM,cAAc,CAAC;AAO/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAU,GAAG,EAAW,SAAS,
|
|
1
|
+
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAc,MAAM,eAAe,CAAC;AAClH,OAAO,EAAE,EAAE,EAAe,MAAM,cAAc,CAAC;AAO/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAU,GAAG,EAAW,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE7F,OAAO,EAAE,iBAAiB,EAAY,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,eAAO,MAAM,OAAO,MAAO,GAAG,WAA6B,CAAC;AAC5D,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,eAAO,MAAM,GAAG,YAAa,GAAG,EAAE,SAIjC,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;KACpB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;KACpB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACL,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAEjC;;SAEK;IACL,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,eAAe,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAEzE,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CAEpB,CAAA;AACD,KAAK,qBAAqB,GAAG,kBAAkB,GAAG;IAChD,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;IAGvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACtE,CAAA;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,SAAS,SAAiB;IAEjC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,IAAI,EAAE,CAEX;IACD,IAAI,GAAG,IAAI,eAAe,CAEzB;IAED,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,CAAC,EAAE,EAAE,MAAM,GAAG;gBAAE,IAAI,EAAE,kBAAkB,EAAE,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACzE,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC,CAAa;IAEnF,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;IAExD,OAAO;IAiBP,UAAU;;;MAGT;IACD,aAAa;;0BAEO,MAAM;MAKzB;IAED,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,mBAAmB,SAAa;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IAmB1C,OAAc,SAAS;;;;OAKtB;IAED,OAAc,MAAM,YAAmB,oBAAoB,wCAG1D;IAED,SAAS,UAAS;IAClB,OAAO,aAWN;IAED,WAAW,gBAMV;IAED,WAAW,UAAS;IACpB,IAAI,2CAAgC;IAEpC,YAAY;;;;;MAKD;IAEX,MAAM,CAAC,uBAAuB,WAA6H;IAE3J,MAAM,CAAC,kCAAkC,SAA2D;IACpG,eAAe,yBAuHd;IAED,OAAO;IAKP,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAIpE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM9C,aAAa,SAAgB;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,mBAqH/C;IAGD,WAAW,CAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,CAAC,EAAE,GAAG;IAgD9C,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM;IAO9C,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ;IAIxG;;;OAGG;IACG,OAAO,CAAC,UAAU,EAAE,aAAa;IAoHjC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,GAAG,iBAAiB,CAAC;IAuIhG,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG;IAepF,kBAAkB,QAAO;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAmBnE;IAED,oBAAoB,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM;IAwDjE,mBAAmB,eAAsB,MAAM,sBAgB9C;IAQD,iBAAiB,wBAQhB;IAGD,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAChD,UAAU,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;KAAE,EAAE,WAAW,CAAC,EAAE,uBAAuB;CA6D3G;AAKD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA"}
|
|
@@ -15,7 +15,7 @@ const pgPromise = require("pg-promise");
|
|
|
15
15
|
const prostgles_types_1 = require("prostgles-types");
|
|
16
16
|
const SyncReplication_1 = require("../SyncReplication");
|
|
17
17
|
const util_1 = require("prostgles-types/dist/util");
|
|
18
|
-
|
|
18
|
+
const pgp = pgPromise({
|
|
19
19
|
promiseLib: Bluebird
|
|
20
20
|
});
|
|
21
21
|
const asValue = (v) => pgp.as.format("$1", [v]);
|
|
@@ -252,8 +252,8 @@ class PubSubManager {
|
|
|
252
252
|
return;
|
|
253
253
|
}
|
|
254
254
|
/* Throttle the subscriptions */
|
|
255
|
-
for (
|
|
256
|
-
|
|
255
|
+
for (let i = 0; i < subs.length; i++) {
|
|
256
|
+
const sub = subs[i];
|
|
257
257
|
if (this.dbo[sub.table_name] &&
|
|
258
258
|
sub.is_ready &&
|
|
259
259
|
(sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
|
|
@@ -285,7 +285,7 @@ class PubSubManager {
|
|
|
285
285
|
}
|
|
286
286
|
};
|
|
287
287
|
this.getActiveListeners = () => {
|
|
288
|
-
|
|
288
|
+
const result = [];
|
|
289
289
|
const upsert = (t, c) => {
|
|
290
290
|
if (!result.find(r => r.table_name === t && r.condition === c)) {
|
|
291
291
|
result.push({ table_name: t, condition: c });
|
|
@@ -312,7 +312,7 @@ class PubSubManager {
|
|
|
312
312
|
AND table_name = 'hypertable' \
|
|
313
313
|
);", { schema });
|
|
314
314
|
if (res.exists) {
|
|
315
|
-
|
|
315
|
+
const isHyperTable = await this.db.any("SELECT * FROM " + (0, prostgles_types_1.asName)(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
|
|
316
316
|
if (isHyperTable && isHyperTable.length) {
|
|
317
317
|
throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084";
|
|
318
318
|
}
|
|
@@ -417,7 +417,7 @@ class PubSubManager {
|
|
|
417
417
|
*/
|
|
418
418
|
async addSync(syncParams) {
|
|
419
419
|
const { socket = null, table_info = null, table_rules, synced_field = null, allow_delete = false, id_fields = [], filter = {}, params, condition = "", throttle = 0 } = syncParams || {};
|
|
420
|
-
|
|
420
|
+
const conditionParsed = parseCondition(condition);
|
|
421
421
|
if (!socket || !table_info)
|
|
422
422
|
throw "socket or table_info missing";
|
|
423
423
|
const { name: table_name } = table_info, channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.sync`;
|
|
@@ -425,7 +425,7 @@ class PubSubManager {
|
|
|
425
425
|
throw "synced_field missing from table_rules";
|
|
426
426
|
this.upsertSocket(socket, channel_name);
|
|
427
427
|
const upsertSync = () => {
|
|
428
|
-
|
|
428
|
+
const newSync = {
|
|
429
429
|
channel_name,
|
|
430
430
|
table_name,
|
|
431
431
|
filter,
|
|
@@ -501,7 +501,7 @@ class PubSubManager {
|
|
|
501
501
|
return newSync;
|
|
502
502
|
};
|
|
503
503
|
// const { min_id, max_id, count, max_synced } = params;
|
|
504
|
-
|
|
504
|
+
const _sync = upsertSync();
|
|
505
505
|
await this.addTrigger({ table_name, condition: conditionParsed });
|
|
506
506
|
return channel_name;
|
|
507
507
|
}
|
|
@@ -617,7 +617,7 @@ class PubSubManager {
|
|
|
617
617
|
}
|
|
618
618
|
}
|
|
619
619
|
removeLocalSub(table_name, condition, func) {
|
|
620
|
-
|
|
620
|
+
const cond = parseCondition(condition);
|
|
621
621
|
if ((0, utils_1.get)(this.subs, [table_name, cond, "subs"])) {
|
|
622
622
|
this.subs[table_name][cond].subs.map((sub, i) => {
|
|
623
623
|
if (sub.func && sub.func === func) {
|
|
@@ -665,6 +665,7 @@ class PubSubManager {
|
|
|
665
665
|
});
|
|
666
666
|
}
|
|
667
667
|
if (!socket) {
|
|
668
|
+
// Do nothing
|
|
668
669
|
}
|
|
669
670
|
else if (!channel_name) {
|
|
670
671
|
delete this.sockets[socket.id];
|
|
@@ -678,7 +679,8 @@ class PubSubManager {
|
|
|
678
679
|
}
|
|
679
680
|
async addTrigger(params, viewOptions) {
|
|
680
681
|
try {
|
|
681
|
-
|
|
682
|
+
const { table_name } = { ...params };
|
|
683
|
+
let { condition } = { ...params };
|
|
682
684
|
if (!table_name)
|
|
683
685
|
throw "MISSING table_name";
|
|
684
686
|
if (!this.appID)
|
|
@@ -750,7 +752,7 @@ PubSubManager.create = async (options) => {
|
|
|
750
752
|
};
|
|
751
753
|
PubSubManager.SCHEMA_ALTERING_QUERIES = ['CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO'];
|
|
752
754
|
PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID = "prostgles internal query that should be excluded from ";
|
|
753
|
-
const parseCondition = (condition) =>
|
|
755
|
+
const parseCondition = (condition) => condition && condition.trim().length ? condition : "TRUE";
|
|
754
756
|
var prostgles_types_2 = require("prostgles-types");
|
|
755
757
|
Object.defineProperty(exports, "pickKeys", { enumerable: true, get: function () { return prostgles_types_2.pickKeys; } });
|
|
756
758
|
Object.defineProperty(exports, "omitKeys", { enumerable: true, get: function () { return prostgles_types_2.omitKeys; } });
|