prostgles-server 4.2.264 → 4.2.265
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/prepareSortItems.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.d.ts.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.js +10 -2
- package/dist/JSONBValidation/JSONBValidation.js.map +1 -1
- package/dist/JSONBValidation/JSONBValidation.spec.d.ts +2 -0
- package/dist/JSONBValidation/JSONBValidation.spec.d.ts.map +1 -0
- package/dist/JSONBValidation/JSONBValidation.spec.js +54 -0
- package/dist/JSONBValidation/JSONBValidation.spec.js.map +1 -0
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +1 -4
- package/lib/JSONBValidation/JSONBValidation.spec.ts +94 -0
- package/lib/JSONBValidation/JSONBValidation.ts +10 -2
- package/package.json +2 -1
- package/tsconfig.json +3 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;AAI9F,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EAoHV,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":";;;AAAA,+CAAqF;AAErF,+DAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.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,EAAuC,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7E,eAAO,MAAM,eAAe,iBAAkB,MAAM,SAAS,KAAG,MAAM,YAIrE,CAAC;
|
|
1
|
+
{"version":3,"file":"JSONBValidation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7E,eAAO,MAAM,eAAe,iBAAkB,MAAM,SAAS,KAAG,MAAM,YAIrE,CAAC;AA+FF,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"}
|
|
@@ -59,8 +59,11 @@ const getPropertyValidationError = (key, val, rawFieldType, path = []) => {
|
|
|
59
59
|
}
|
|
60
60
|
if (type) {
|
|
61
61
|
if ((0, prostgles_types_1.isObject)(type)) {
|
|
62
|
+
if (!(0, prostgles_types_1.isObject)(val)) {
|
|
63
|
+
return `${[...path, key].join(".")} is of invalid type. Expecting object`;
|
|
64
|
+
}
|
|
62
65
|
for (const [subKey, subSchema] of (0, prostgles_types_1.getObjectEntries)(type)) {
|
|
63
|
-
const error = getPropertyValidationError(subKey, val, subSchema, [...path, key]);
|
|
66
|
+
const error = getPropertyValidationError(subKey, val[subKey], subSchema, [...path, key]);
|
|
64
67
|
if (error) {
|
|
65
68
|
return error;
|
|
66
69
|
}
|
|
@@ -76,7 +79,12 @@ const getPropertyValidationError = (key, val, rawFieldType, path = []) => {
|
|
|
76
79
|
return;
|
|
77
80
|
}
|
|
78
81
|
if (fieldType.enum) {
|
|
79
|
-
|
|
82
|
+
const otherOptions = [];
|
|
83
|
+
if (fieldType.nullable)
|
|
84
|
+
otherOptions.push(null);
|
|
85
|
+
if (fieldType.optional)
|
|
86
|
+
otherOptions.push(undefined);
|
|
87
|
+
err += `one of: ${JSON.stringify([...fieldType.enum, ...otherOptions]).slice(1, -1)}`;
|
|
80
88
|
if (!fieldType.enum.includes(val))
|
|
81
89
|
return err;
|
|
82
90
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONBValidation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"JSONBValidation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JSONBValidation.spec.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_test_1 = require("node:test");
|
|
4
|
+
const assert_1 = require("assert");
|
|
5
|
+
const JSONBValidation_1 = require("./JSONBValidation");
|
|
6
|
+
void (0, node_test_1.describe)("JSONBValidation", async () => {
|
|
7
|
+
await (0, node_test_1.test)("getJSONBObjectSchemaValidationError", () => {
|
|
8
|
+
const schema = {
|
|
9
|
+
type: {
|
|
10
|
+
name: "string",
|
|
11
|
+
age: { type: "integer", nullable: true },
|
|
12
|
+
address: {
|
|
13
|
+
type: {
|
|
14
|
+
street: "string",
|
|
15
|
+
city: "string",
|
|
16
|
+
street_number: { type: "integer", optional: true },
|
|
17
|
+
t: { enum: ["a", "b", "c"], optional: true },
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
const obj = {
|
|
23
|
+
name: "John Doe",
|
|
24
|
+
age: 30,
|
|
25
|
+
address: {
|
|
26
|
+
street: "123 Main St",
|
|
27
|
+
city: "New York",
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, null, "test"), {
|
|
31
|
+
error: "Expecting test to be an object",
|
|
32
|
+
});
|
|
33
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, {}, "test"), {
|
|
34
|
+
error: "name is of invalid type. Expecting string",
|
|
35
|
+
});
|
|
36
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, obj, "test"), {
|
|
37
|
+
data: obj,
|
|
38
|
+
});
|
|
39
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, age: null }, "test"), {
|
|
40
|
+
data: { ...obj, age: null },
|
|
41
|
+
});
|
|
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",
|
|
44
|
+
});
|
|
45
|
+
assert_1.strict.deepStrictEqual((0, JSONBValidation_1.getJSONBObjectSchemaValidationError)(schema.type, { ...obj, address: { ...obj.address, city: 22 } }, "test"), {
|
|
46
|
+
error: "address.city is of invalid type. Expecting string",
|
|
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" });
|
|
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
|
+
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 one of: "a","b","c",null' });
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=JSONBValidation.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JSONBValidation.spec.js","sourceRoot":"","sources":["../../lib/JSONBValidation/JSONBValidation.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { OrderBy, asName, isDefined, isEmpty, isObject } from "prostgles-types/dist";
|
|
2
2
|
import { SortItem } from "../DboBuilder";
|
|
3
3
|
import { NewQueryJoin, SelectItemValidated, asNameAlias } from "../QueryBuilder/QueryBuilder";
|
|
4
|
-
import {
|
|
5
|
-
getJSONBObjectSchemaValidationError,
|
|
6
|
-
validateJSONBObjectAgainstSchema,
|
|
7
|
-
} from "../../JSONBValidation/JSONBValidation";
|
|
4
|
+
import { getJSONBObjectSchemaValidationError } from "../../JSONBValidation/JSONBValidation";
|
|
8
5
|
|
|
9
6
|
/* This relates only to SELECT */
|
|
10
7
|
export const prepareSortItems = (
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { test, describe } from "node:test";
|
|
2
|
+
import type { JSONB } from "prostgles-types";
|
|
3
|
+
import { strict as assert } from "assert";
|
|
4
|
+
import { getJSONBObjectSchemaValidationError } from "./JSONBValidation";
|
|
5
|
+
|
|
6
|
+
void describe("JSONBValidation", async () => {
|
|
7
|
+
await test("getJSONBObjectSchemaValidationError", () => {
|
|
8
|
+
const schema: JSONB.ObjectType = {
|
|
9
|
+
type: {
|
|
10
|
+
name: "string",
|
|
11
|
+
age: { type: "integer", nullable: true },
|
|
12
|
+
address: {
|
|
13
|
+
type: {
|
|
14
|
+
street: "string",
|
|
15
|
+
city: "string",
|
|
16
|
+
street_number: { type: "integer", optional: true },
|
|
17
|
+
t: { enum: ["a", "b", "c"], optional: true },
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
const obj = {
|
|
23
|
+
name: "John Doe",
|
|
24
|
+
age: 30,
|
|
25
|
+
address: {
|
|
26
|
+
street: "123 Main St",
|
|
27
|
+
city: "New York",
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
assert.deepStrictEqual(getJSONBObjectSchemaValidationError(schema.type, null, "test"), {
|
|
31
|
+
error: "Expecting test to be an object",
|
|
32
|
+
});
|
|
33
|
+
assert.deepStrictEqual(getJSONBObjectSchemaValidationError(schema.type, {}, "test"), {
|
|
34
|
+
error: "name is of invalid type. Expecting string",
|
|
35
|
+
});
|
|
36
|
+
assert.deepStrictEqual(getJSONBObjectSchemaValidationError(schema.type, obj, "test"), {
|
|
37
|
+
data: obj,
|
|
38
|
+
});
|
|
39
|
+
assert.deepStrictEqual(
|
|
40
|
+
getJSONBObjectSchemaValidationError(schema.type, { ...obj, age: null }, "test"),
|
|
41
|
+
{
|
|
42
|
+
data: { ...obj, age: null },
|
|
43
|
+
}
|
|
44
|
+
);
|
|
45
|
+
assert.deepStrictEqual(
|
|
46
|
+
getJSONBObjectSchemaValidationError(schema.type, { ...obj, age: 22.2 }, "test"),
|
|
47
|
+
{
|
|
48
|
+
error: "age is of invalid type. Expecting integer",
|
|
49
|
+
}
|
|
50
|
+
);
|
|
51
|
+
assert.deepStrictEqual(
|
|
52
|
+
getJSONBObjectSchemaValidationError(
|
|
53
|
+
schema.type,
|
|
54
|
+
{ ...obj, address: { ...obj.address, city: 22 } },
|
|
55
|
+
"test"
|
|
56
|
+
),
|
|
57
|
+
{
|
|
58
|
+
error: "address.city is of invalid type. Expecting string",
|
|
59
|
+
}
|
|
60
|
+
);
|
|
61
|
+
assert.deepStrictEqual(
|
|
62
|
+
getJSONBObjectSchemaValidationError(
|
|
63
|
+
schema.type,
|
|
64
|
+
{ ...obj, address: { ...obj.address, street_number: 22.22 } },
|
|
65
|
+
"test"
|
|
66
|
+
),
|
|
67
|
+
{ error: "address.street_number is of invalid type. Expecting integer" }
|
|
68
|
+
);
|
|
69
|
+
assert.deepStrictEqual(
|
|
70
|
+
getJSONBObjectSchemaValidationError(
|
|
71
|
+
schema.type,
|
|
72
|
+
{ ...obj, address: { ...obj.address, street_number: undefined } },
|
|
73
|
+
"test"
|
|
74
|
+
),
|
|
75
|
+
{ data: { ...obj, address: { ...obj.address, street_number: undefined } } }
|
|
76
|
+
);
|
|
77
|
+
assert.deepStrictEqual(
|
|
78
|
+
getJSONBObjectSchemaValidationError(
|
|
79
|
+
schema.type,
|
|
80
|
+
{ ...obj, address: { ...obj.address, t: "c" } },
|
|
81
|
+
"test"
|
|
82
|
+
),
|
|
83
|
+
{ data: { ...obj, address: { ...obj.address, t: "c" } } }
|
|
84
|
+
);
|
|
85
|
+
assert.deepStrictEqual(
|
|
86
|
+
getJSONBObjectSchemaValidationError(
|
|
87
|
+
schema.type,
|
|
88
|
+
{ ...obj, address: { ...obj.address, t: 2 } },
|
|
89
|
+
"test"
|
|
90
|
+
),
|
|
91
|
+
{ error: 'address.t is of invalid type. Expecting one of: "a","b","c",null' }
|
|
92
|
+
);
|
|
93
|
+
});
|
|
94
|
+
});
|
|
@@ -66,8 +66,11 @@ const getPropertyValidationError = (
|
|
|
66
66
|
}
|
|
67
67
|
if (type) {
|
|
68
68
|
if (isObject(type)) {
|
|
69
|
+
if (!isObject(val)) {
|
|
70
|
+
return `${[...path, key].join(".")} is of invalid type. Expecting object`;
|
|
71
|
+
}
|
|
69
72
|
for (const [subKey, subSchema] of getObjectEntries(type)) {
|
|
70
|
-
const error = getPropertyValidationError(subKey, val, subSchema, [...path, key]);
|
|
73
|
+
const error = getPropertyValidationError(subKey, val[subKey], subSchema, [...path, key]);
|
|
71
74
|
if (error) {
|
|
72
75
|
return error;
|
|
73
76
|
}
|
|
@@ -83,8 +86,13 @@ const getPropertyValidationError = (
|
|
|
83
86
|
}
|
|
84
87
|
return;
|
|
85
88
|
}
|
|
89
|
+
|
|
86
90
|
if (fieldType.enum) {
|
|
87
|
-
|
|
91
|
+
const otherOptions = [];
|
|
92
|
+
if (fieldType.nullable) otherOptions.push(null);
|
|
93
|
+
if (fieldType.optional) otherOptions.push(undefined);
|
|
94
|
+
err += `one of: ${JSON.stringify([...fieldType.enum, ...otherOptions]).slice(1, -1)}`;
|
|
95
|
+
|
|
88
96
|
if (!fieldType.enum.includes(val)) return err;
|
|
89
97
|
return;
|
|
90
98
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.265",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"test-only": "cd tests/ && ./test.sh",
|
|
16
16
|
"test-quick": "cd tests/ && ./test.sh -quick",
|
|
17
17
|
"test": "rm -rf ./node_modules/* && rm -rf ./dist/* && npm i && npm run lint && npm run test-only",
|
|
18
|
+
"test-server-funcs": "node --trace-uncaught --test dist/**/*.spec.js",
|
|
18
19
|
"generate-docs": "rm -f ./docs/*.md && cd docs/utils && npm start",
|
|
19
20
|
"pushpublish": "npm run generate-docs && npm version patch --git-tag-version false && git push && npm publish"
|
|
20
21
|
},
|