@stamhoofd/sql 2.89.1 → 2.90.0
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/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -10
- package/dist/index.js.map +1 -1
- package/dist/src/SQLJsonExpressions.d.ts +2 -0
- package/dist/src/SQLJsonExpressions.d.ts.map +1 -1
- package/dist/src/SQLJsonExpressions.js +8 -0
- package/dist/src/SQLJsonExpressions.js.map +1 -1
- package/dist/src/SQLSelect.d.ts.map +1 -1
- package/dist/src/SQLSelect.js +7 -0
- package/dist/src/SQLSelect.js.map +1 -1
- package/dist/src/SQLWhere.d.ts +6 -0
- package/dist/src/SQLWhere.d.ts.map +1 -1
- package/dist/src/SQLWhere.js +39 -1
- package/dist/src/SQLWhere.js.map +1 -1
- package/dist/src/filters/SQLFilter.d.ts +61 -25
- package/dist/src/filters/SQLFilter.d.ts.map +1 -1
- package/dist/src/filters/SQLFilter.js +183 -380
- package/dist/src/filters/SQLFilter.js.map +1 -1
- package/dist/src/filters/{modern/compilers → compilers}/contains.d.ts +1 -1
- package/dist/src/filters/compilers/contains.d.ts.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/contains.js +6 -6
- package/dist/src/filters/compilers/contains.js.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/equals.d.ts +1 -1
- package/dist/src/filters/compilers/equals.d.ts.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/equals.js +7 -7
- package/dist/src/filters/compilers/equals.js.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/greater.d.ts +1 -1
- package/dist/src/filters/compilers/greater.d.ts.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/greater.js +4 -4
- package/dist/src/filters/compilers/greater.js.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/in.d.ts +1 -1
- package/dist/src/filters/compilers/in.d.ts.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/in.js +7 -7
- package/dist/src/filters/compilers/in.js.map +1 -0
- package/dist/src/filters/compilers/index.d.ts.map +1 -0
- package/dist/src/filters/compilers/index.js.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/less.d.ts +1 -1
- package/dist/src/filters/compilers/less.d.ts.map +1 -0
- package/dist/src/filters/{modern/compilers → compilers}/less.js +4 -4
- package/dist/src/filters/compilers/less.js.map +1 -0
- package/dist/src/filters/helpers/isJSONColumn.d.ts +4 -0
- package/dist/src/filters/helpers/isJSONColumn.d.ts.map +1 -0
- package/dist/src/filters/helpers/isJSONColumn.js +16 -0
- package/dist/src/filters/helpers/isJSONColumn.js.map +1 -0
- package/dist/src/filters/{modern/helpers → helpers}/normalizeCompareValue.d.ts +2 -2
- package/dist/src/filters/helpers/normalizeCompareValue.d.ts.map +1 -0
- package/dist/src/filters/{modern/helpers → helpers}/normalizeCompareValue.js +13 -13
- package/dist/src/filters/helpers/normalizeCompareValue.js.map +1 -0
- package/dist/tests/filters/$and.test.js +49 -18
- package/dist/tests/filters/$and.test.js.map +1 -1
- package/dist/tests/filters/$contains.test.js +20 -20
- package/dist/tests/filters/$contains.test.js.map +1 -1
- package/dist/tests/filters/$eq.test.js +59 -53
- package/dist/tests/filters/$eq.test.js.map +1 -1
- package/dist/tests/filters/$gt.test.js +18 -18
- package/dist/tests/filters/$gt.test.js.map +1 -1
- package/dist/tests/filters/$gte.test.js +14 -14
- package/dist/tests/filters/$gte.test.js.map +1 -1
- package/dist/tests/filters/$in.test.js +24 -24
- package/dist/tests/filters/$in.test.js.map +1 -1
- package/dist/tests/filters/$lt.test.js +14 -14
- package/dist/tests/filters/$lt.test.js.map +1 -1
- package/dist/tests/filters/$lte.test.js +14 -14
- package/dist/tests/filters/$lte.test.js.map +1 -1
- package/dist/tests/filters/$neq.test.js +3 -3
- package/dist/tests/filters/$neq.test.js.map +1 -1
- package/dist/tests/filters/$not.test.js +5 -5
- package/dist/tests/filters/$not.test.js.map +1 -1
- package/dist/tests/filters/$or.test.js +16 -16
- package/dist/tests/filters/$or.test.js.map +1 -1
- package/dist/tests/filters/dot-syntax.test.js +10 -10
- package/dist/tests/filters/dot-syntax.test.js.map +1 -1
- package/dist/tests/filters/exists.test.js +16 -16
- package/dist/tests/filters/exists.test.js.map +1 -1
- package/dist/tests/filters/joined-relations.test.js +31 -31
- package/dist/tests/filters/joined-relations.test.js.map +1 -1
- package/dist/tests/filters/special-cases.test.js +11 -11
- package/dist/tests/filters/special-cases.test.js.map +1 -1
- package/dist/tests/filters/wildcard.test.js +8 -8
- package/dist/tests/filters/wildcard.test.js.map +1 -1
- package/dist/tests/utils/index.d.ts +7 -7
- package/dist/tests/utils/index.d.ts.map +1 -1
- package/dist/tests/utils/index.js +6 -6
- package/dist/tests/utils/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/SQLJsonExpressions.ts +10 -0
- package/src/SQLSelect.ts +9 -0
- package/src/SQLWhere.ts +48 -1
- package/src/filters/SQLFilter.ts +203 -485
- package/src/filters/{modern/compilers → compilers}/contains.ts +5 -5
- package/src/filters/{modern/compilers → compilers}/equals.ts +6 -6
- package/src/filters/{modern/compilers → compilers}/greater.ts +3 -3
- package/src/filters/{modern/compilers → compilers}/in.ts +6 -6
- package/src/filters/{modern/compilers → compilers}/less.ts +3 -3
- package/src/filters/helpers/isJSONColumn.ts +13 -0
- package/src/filters/{modern/helpers → helpers}/normalizeCompareValue.ts +14 -14
- package/dist/src/filters/modern/SQLModernFilter.d.ts +0 -73
- package/dist/src/filters/modern/SQLModernFilter.d.ts.map +0 -1
- package/dist/src/filters/modern/SQLModernFilter.js +0 -200
- package/dist/src/filters/modern/SQLModernFilter.js.map +0 -1
- package/dist/src/filters/modern/compilers/contains.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/contains.js.map +0 -1
- package/dist/src/filters/modern/compilers/equals.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/equals.js.map +0 -1
- package/dist/src/filters/modern/compilers/greater.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/greater.js.map +0 -1
- package/dist/src/filters/modern/compilers/in.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/in.js.map +0 -1
- package/dist/src/filters/modern/compilers/index.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/index.js.map +0 -1
- package/dist/src/filters/modern/compilers/less.d.ts.map +0 -1
- package/dist/src/filters/modern/compilers/less.js.map +0 -1
- package/dist/src/filters/modern/helpers/isJSONColumn.d.ts +0 -4
- package/dist/src/filters/modern/helpers/isJSONColumn.d.ts.map +0 -1
- package/dist/src/filters/modern/helpers/isJSONColumn.js +0 -16
- package/dist/src/filters/modern/helpers/isJSONColumn.js.map +0 -1
- package/dist/src/filters/modern/helpers/normalizeCompareValue.d.ts.map +0 -1
- package/dist/src/filters/modern/helpers/normalizeCompareValue.js.map +0 -1
- package/src/filters/modern/SQLModernFilter.ts +0 -256
- package/src/filters/modern/helpers/isJSONColumn.ts +0 -13
- /package/dist/src/filters/{modern/compilers → compilers}/index.d.ts +0 -0
- /package/dist/src/filters/{modern/compilers → compilers}/index.js +0 -0
- /package/src/filters/{modern/compilers → compilers}/index.ts +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('$or', () => {
|
|
@@ -12,8 +12,8 @@ describe('$or', () => {
|
|
|
12
12
|
});
|
|
13
13
|
it('If one child is always true, the whole $or is always true', async () => {
|
|
14
14
|
const filters = {
|
|
15
|
-
...
|
|
16
|
-
name: (0,
|
|
15
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
16
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
17
17
|
};
|
|
18
18
|
await (0, utils_1.test)({
|
|
19
19
|
filter: {
|
|
@@ -33,8 +33,8 @@ describe('$or', () => {
|
|
|
33
33
|
});
|
|
34
34
|
it('An empty $or is always false', async () => {
|
|
35
35
|
const filters = {
|
|
36
|
-
...
|
|
37
|
-
name: (0,
|
|
36
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
37
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
38
38
|
};
|
|
39
39
|
await (0, utils_1.test)({
|
|
40
40
|
filter: {
|
|
@@ -49,8 +49,8 @@ describe('$or', () => {
|
|
|
49
49
|
});
|
|
50
50
|
it('If all children are always false, the whole $or is always false', async () => {
|
|
51
51
|
const filters = {
|
|
52
|
-
...
|
|
53
|
-
name: (0,
|
|
52
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
53
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
54
54
|
};
|
|
55
55
|
await (0, utils_1.test)({
|
|
56
56
|
filter: {
|
|
@@ -74,8 +74,8 @@ describe('$or', () => {
|
|
|
74
74
|
});
|
|
75
75
|
it('Children that are always false are removed from the $or', async () => {
|
|
76
76
|
const filters = {
|
|
77
|
-
...
|
|
78
|
-
name: (0,
|
|
77
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
78
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
79
79
|
};
|
|
80
80
|
await (0, utils_1.test)({
|
|
81
81
|
filter: {
|
|
@@ -97,9 +97,9 @@ describe('$or', () => {
|
|
|
97
97
|
});
|
|
98
98
|
it('$or object children are $and together', async () => {
|
|
99
99
|
const filters = {
|
|
100
|
-
...
|
|
101
|
-
name: (0,
|
|
102
|
-
age: (0,
|
|
100
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
101
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
102
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
|
|
103
103
|
};
|
|
104
104
|
await (0, utils_1.test)({
|
|
105
105
|
filter: [
|
|
@@ -130,8 +130,8 @@ describe('$or', () => {
|
|
|
130
130
|
});
|
|
131
131
|
it('empty $or branches are removed', async () => {
|
|
132
132
|
const filters = {
|
|
133
|
-
...
|
|
134
|
-
name: (0,
|
|
133
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
134
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
135
135
|
};
|
|
136
136
|
await (0, utils_1.test)({
|
|
137
137
|
filter: {
|
|
@@ -156,8 +156,8 @@ describe('$or', () => {
|
|
|
156
156
|
});
|
|
157
157
|
it('deep $or branches are cleaned up', async () => {
|
|
158
158
|
const filters = {
|
|
159
|
-
...
|
|
160
|
-
name: (0,
|
|
159
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
160
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
161
161
|
};
|
|
162
162
|
await (0, utils_1.test)({
|
|
163
163
|
filter: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$or.test.js","sourceRoot":"","sources":["../../../tests/filters/$or.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"$or.test.js","sourceRoot":"","sources":["../../../tests/filters/$or.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('Dot syntax', () => {
|
|
7
7
|
const filters = {
|
|
8
|
-
...
|
|
9
|
-
name: (0,
|
|
10
|
-
age: (0,
|
|
8
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
9
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
10
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
|
|
11
11
|
settings: {
|
|
12
|
-
...
|
|
13
|
-
name: (0,
|
|
14
|
-
age: (0,
|
|
12
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
13
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
|
|
14
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
|
|
15
15
|
dog: {
|
|
16
|
-
...
|
|
17
|
-
name: (0,
|
|
18
|
-
age: (0,
|
|
16
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
17
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.dog.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
|
|
18
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.dog.age'), type: SQLFilter_1.SQLValueType.JSONNumber, nullable: true }),
|
|
19
19
|
},
|
|
20
20
|
},
|
|
21
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dot-syntax.test.js","sourceRoot":"","sources":["../../../tests/filters/dot-syntax.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"dot-syntax.test.js","sourceRoot":"","sources":["../../../tests/filters/dot-syntax.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('Exists relations', () => {
|
|
@@ -16,13 +16,13 @@ describe('Exists relations', () => {
|
|
|
16
16
|
});
|
|
17
17
|
it('Added when used', async () => {
|
|
18
18
|
const filters = {
|
|
19
|
-
...
|
|
20
|
-
name: (0,
|
|
21
|
-
organizations: (0,
|
|
19
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
20
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
21
|
+
organizations: (0, SQLFilter_1.createExistsFilter)(SQL_1.SQL.select()
|
|
22
22
|
.from('organizations', 'o')
|
|
23
23
|
.where(SQL_1.SQL.parentColumn('organizationId'), SQL_1.SQL.column('id')), {
|
|
24
|
-
...
|
|
25
|
-
id: (0,
|
|
24
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
25
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
26
26
|
}),
|
|
27
27
|
};
|
|
28
28
|
await (0, utils_1.testSelect)({
|
|
@@ -44,13 +44,13 @@ describe('Exists relations', () => {
|
|
|
44
44
|
});
|
|
45
45
|
it('Also added when always true', async () => {
|
|
46
46
|
const filters = {
|
|
47
|
-
...
|
|
48
|
-
name: (0,
|
|
49
|
-
organizations: (0,
|
|
47
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
48
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
49
|
+
organizations: (0, SQLFilter_1.createExistsFilter)(SQL_1.SQL.select()
|
|
50
50
|
.from('organizations', 'o')
|
|
51
51
|
.where(SQL_1.SQL.parentColumn('organizationId'), SQL_1.SQL.column('id')), {
|
|
52
|
-
...
|
|
53
|
-
id: (0,
|
|
52
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
53
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
54
54
|
}),
|
|
55
55
|
};
|
|
56
56
|
await (0, utils_1.testSelect)({
|
|
@@ -74,13 +74,13 @@ describe('Exists relations', () => {
|
|
|
74
74
|
});
|
|
75
75
|
it('Not added when always false', async () => {
|
|
76
76
|
const filters = {
|
|
77
|
-
...
|
|
78
|
-
name: (0,
|
|
79
|
-
organizations: (0,
|
|
77
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
78
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
79
|
+
organizations: (0, SQLFilter_1.createExistsFilter)(SQL_1.SQL.select()
|
|
80
80
|
.from('organizations', 'o')
|
|
81
81
|
.where(SQL_1.SQL.parentColumn('organizationId'), SQL_1.SQL.column('id')), {
|
|
82
|
-
...
|
|
83
|
-
id: (0,
|
|
82
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
83
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
84
84
|
}),
|
|
85
85
|
};
|
|
86
86
|
await (0, utils_1.testSelect)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exists.test.js","sourceRoot":"","sources":["../../../tests/filters/exists.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"exists.test.js","sourceRoot":"","sources":["../../../tests/filters/exists.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('Joined relations', () => {
|
|
@@ -16,11 +16,11 @@ describe('Joined relations', () => {
|
|
|
16
16
|
});
|
|
17
17
|
it('Joins when used', async () => {
|
|
18
18
|
const filters = {
|
|
19
|
-
...
|
|
20
|
-
name: (0,
|
|
21
|
-
organization: (0,
|
|
22
|
-
...
|
|
23
|
-
id: (0,
|
|
19
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
20
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
21
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationJoin, {
|
|
22
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
23
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
24
24
|
}),
|
|
25
25
|
};
|
|
26
26
|
await (0, utils_1.testSelect)({
|
|
@@ -40,11 +40,11 @@ describe('Joined relations', () => {
|
|
|
40
40
|
});
|
|
41
41
|
it('Joins only once when used twice', async () => {
|
|
42
42
|
const filters = {
|
|
43
|
-
...
|
|
44
|
-
name: (0,
|
|
45
|
-
organization: (0,
|
|
46
|
-
...
|
|
47
|
-
id: (0,
|
|
43
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
44
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
45
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationJoin, {
|
|
46
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
47
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
48
48
|
}),
|
|
49
49
|
};
|
|
50
50
|
await (0, utils_1.testSelect)({
|
|
@@ -69,11 +69,11 @@ describe('Joined relations', () => {
|
|
|
69
69
|
});
|
|
70
70
|
it('Does not left join when always true', async () => {
|
|
71
71
|
const filters = {
|
|
72
|
-
...
|
|
73
|
-
name: (0,
|
|
74
|
-
organization: (0,
|
|
75
|
-
...
|
|
76
|
-
id: (0,
|
|
72
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
73
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
74
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationJoin, {
|
|
75
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
76
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
77
77
|
}),
|
|
78
78
|
};
|
|
79
79
|
await (0, utils_1.testSelect)({
|
|
@@ -91,11 +91,11 @@ describe('Joined relations', () => {
|
|
|
91
91
|
});
|
|
92
92
|
it('Does inner join when always true and relationAlwaysExist is false', async () => {
|
|
93
93
|
const filters = {
|
|
94
|
-
...
|
|
95
|
-
name: (0,
|
|
96
|
-
organization: (0,
|
|
97
|
-
...
|
|
98
|
-
id: (0,
|
|
94
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
95
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
96
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationInnerJoin, {
|
|
97
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
98
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
99
99
|
}, { doesRelationAlwaysExist: false }),
|
|
100
100
|
};
|
|
101
101
|
await (0, utils_1.testSelect)({
|
|
@@ -117,11 +117,11 @@ describe('Joined relations', () => {
|
|
|
117
117
|
});
|
|
118
118
|
it('Does inner join when always true and relationAlwaysExist is true', async () => {
|
|
119
119
|
const filters = {
|
|
120
|
-
...
|
|
121
|
-
name: (0,
|
|
122
|
-
organization: (0,
|
|
123
|
-
...
|
|
124
|
-
id: (0,
|
|
120
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
121
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
122
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationInnerJoin, {
|
|
123
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
124
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
125
125
|
}, { doesRelationAlwaysExist: true }),
|
|
126
126
|
};
|
|
127
127
|
await (0, utils_1.testSelect)({
|
|
@@ -143,11 +143,11 @@ describe('Joined relations', () => {
|
|
|
143
143
|
});
|
|
144
144
|
it('Does not join when unused', async () => {
|
|
145
145
|
const filters = {
|
|
146
|
-
...
|
|
147
|
-
name: (0,
|
|
148
|
-
organization: (0,
|
|
149
|
-
...
|
|
150
|
-
id: (0,
|
|
146
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
147
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
148
|
+
organization: (0, SQLFilter_1.createJoinedRelationFilter)(organizationJoin, {
|
|
149
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
150
|
+
id: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('id'), type: SQLFilter_1.SQLValueType.String, nullable: false }),
|
|
151
151
|
}),
|
|
152
152
|
};
|
|
153
153
|
await (0, utils_1.testSelect)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"joined-relations.test.js","sourceRoot":"","sources":["../../../tests/filters/joined-relations.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"joined-relations.test.js","sourceRoot":"","sources":["../../../tests/filters/joined-relations.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('Special filter cases', () => {
|
|
7
7
|
it('Can combine $and with $or', async () => {
|
|
8
8
|
const filters = {
|
|
9
|
-
...
|
|
10
|
-
name: (0,
|
|
11
|
-
age: (0,
|
|
9
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
10
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
11
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
|
|
12
12
|
};
|
|
13
13
|
await (0, utils_1.test)({
|
|
14
14
|
filter: [
|
|
@@ -43,7 +43,7 @@ describe('Special filter cases', () => {
|
|
|
43
43
|
});
|
|
44
44
|
it('Cannot filter on unknown columns', async () => {
|
|
45
45
|
const filters = {
|
|
46
|
-
...
|
|
46
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
47
47
|
};
|
|
48
48
|
await (0, utils_1.testError)({
|
|
49
49
|
filter: {
|
|
@@ -55,9 +55,9 @@ describe('Special filter cases', () => {
|
|
|
55
55
|
});
|
|
56
56
|
it('Cannot stack column filters', async () => {
|
|
57
57
|
const filters = {
|
|
58
|
-
...
|
|
59
|
-
name: (0,
|
|
60
|
-
age: (0,
|
|
58
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
59
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
60
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
|
|
61
61
|
};
|
|
62
62
|
await (0, utils_1.testError)({
|
|
63
63
|
filter: {
|
|
@@ -72,7 +72,7 @@ describe('Special filter cases', () => {
|
|
|
72
72
|
describe('Empty filters', () => {
|
|
73
73
|
it('an empty object filter is always true', async () => {
|
|
74
74
|
const filters = {
|
|
75
|
-
...
|
|
75
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
76
76
|
};
|
|
77
77
|
await (0, utils_1.test)({
|
|
78
78
|
filter: {},
|
|
@@ -85,7 +85,7 @@ describe('Special filter cases', () => {
|
|
|
85
85
|
});
|
|
86
86
|
it('an empty array filter is always true', async () => {
|
|
87
87
|
const filters = {
|
|
88
|
-
...
|
|
88
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
89
89
|
};
|
|
90
90
|
await (0, utils_1.test)({
|
|
91
91
|
filter: [],
|
|
@@ -98,7 +98,7 @@ describe('Special filter cases', () => {
|
|
|
98
98
|
});
|
|
99
99
|
it('a null filter is always true', async () => {
|
|
100
100
|
const filters = {
|
|
101
|
-
...
|
|
101
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
102
102
|
};
|
|
103
103
|
await (0, utils_1.test)({
|
|
104
104
|
filter: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"special-cases.test.js","sourceRoot":"","sources":["../../../tests/filters/special-cases.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"special-cases.test.js","sourceRoot":"","sources":["../../../tests/filters/special-cases.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
3
|
+
const SQLFilter_1 = require("../../src/filters/SQLFilter");
|
|
4
4
|
const SQL_1 = require("../../src/SQL");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
describe('Wildcards', () => {
|
|
7
7
|
const filters = {
|
|
8
|
-
...
|
|
9
|
-
name: (0,
|
|
10
|
-
age: (0,
|
|
8
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
9
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('name'), type: SQLFilter_1.SQLValueType.String, nullable: true }),
|
|
10
|
+
age: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.column('age'), type: SQLFilter_1.SQLValueType.Number, nullable: false }),
|
|
11
11
|
settings: {
|
|
12
|
-
...
|
|
13
|
-
records: (0,
|
|
14
|
-
...
|
|
15
|
-
name: (0,
|
|
12
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
13
|
+
records: (0, SQLFilter_1.createWildcardColumnFilter)((key) => ({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), type: SQLFilter_1.SQLValueType.JSONObject, nullable: true }), (key) => ({
|
|
14
|
+
...SQLFilter_1.baseSQLFilterCompilers,
|
|
15
|
+
name: (0, SQLFilter_1.createColumnFilter)({ expression: SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.jsonValue(SQL_1.SQL.column('settings'), '$.records'), '$.' + key, true), '$.name'), type: SQLFilter_1.SQLValueType.JSONString, nullable: true }),
|
|
16
16
|
})),
|
|
17
17
|
},
|
|
18
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,2DAAyJ;AACzJ,uCAAoC;AACpC,oCAAgC;AAEhC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,OAAO,GAAyB;QAClC,GAAG,kCAAsB;QACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvG,GAAG,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACtG,QAAQ,EAAE;YACN,GAAG,kCAAsB;YACzB,OAAO,EAAE,IAAA,sCAA0B,EAC/B,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACrK,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;gBACd,GAAG,kCAAsB;gBACzB,IAAI,EAAE,IAAA,8BAAkB,EAAC,EAAE,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,wBAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aACxM,CAAC,CACL;SACJ;KACJ,CAAC;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE;oCACF,GAAG,EAAE,KAAK;iCACb;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,6IAA6I;gBACpJ,MAAM,EAAE;oBACJ,KAAK;oBACL,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,IAAA,YAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE,IAAI;6BACb;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,yFAAyF;gBAChG,MAAM,EAAE;oBACJ,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { PlainObject } from '@simonbackx/simple-encoding';
|
|
2
2
|
import { StamhoofdFilter } from '@stamhoofd/structures';
|
|
3
|
-
import {
|
|
3
|
+
import { SQLFilterDefinitions } from '../../src/filters/SQLFilter';
|
|
4
4
|
import { SQLQuery } from '../../src/SQLExpression';
|
|
5
5
|
import { SQLScalarValue } from '../../src/SQLExpressions';
|
|
6
6
|
export declare function testError({ filter, filters, error }: {
|
|
7
7
|
filter: StamhoofdFilter;
|
|
8
|
-
filters:
|
|
8
|
+
filters: SQLFilterDefinitions;
|
|
9
9
|
error: string;
|
|
10
10
|
}): Promise<void>;
|
|
11
11
|
/**
|
|
@@ -13,7 +13,7 @@ export declare function testError({ filter, filters, error }: {
|
|
|
13
13
|
*/
|
|
14
14
|
export declare function test({ filter, filters, query }: {
|
|
15
15
|
filter: StamhoofdFilter;
|
|
16
|
-
filters:
|
|
16
|
+
filters: SQLFilterDefinitions;
|
|
17
17
|
query: SQLQuery;
|
|
18
18
|
}): Promise<void>;
|
|
19
19
|
/**
|
|
@@ -21,17 +21,17 @@ export declare function test({ filter, filters, query }: {
|
|
|
21
21
|
*/
|
|
22
22
|
export declare function testSelect({ filter, filters, query }: {
|
|
23
23
|
filter: StamhoofdFilter;
|
|
24
|
-
filters:
|
|
24
|
+
filters: SQLFilterDefinitions;
|
|
25
25
|
query: SQLQuery;
|
|
26
26
|
}): Promise<void>;
|
|
27
27
|
export declare function testMultiple({ testFilters, filters, query }: {
|
|
28
28
|
testFilters: StamhoofdFilter[];
|
|
29
|
-
filters:
|
|
29
|
+
filters: SQLFilterDefinitions;
|
|
30
30
|
query: SQLQuery;
|
|
31
31
|
}): Promise<void>;
|
|
32
32
|
export declare function testMultipleErrors({ testFilters, filters, error }: {
|
|
33
33
|
testFilters: StamhoofdFilter[];
|
|
34
|
-
filters:
|
|
34
|
+
filters: SQLFilterDefinitions;
|
|
35
35
|
error: string;
|
|
36
36
|
}): Promise<void>;
|
|
37
37
|
export declare function doesQueryMatch(query: SQLQuery, withQuery: SQLQuery): void;
|
|
@@ -52,6 +52,6 @@ export declare function testMatch({ tableDefinition, rows, doMatch, doNotMatch,
|
|
|
52
52
|
doNotMatch?: StamhoofdFilter[];
|
|
53
53
|
tableDefinition: TableDefinition;
|
|
54
54
|
rows: Record<string, SQLScalarValue | null | PlainObject>[];
|
|
55
|
-
filters:
|
|
55
|
+
filters: SQLFilterDefinitions;
|
|
56
56
|
}): Promise<void>;
|
|
57
57
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEvF,OAAO,EAAsB,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAIpI;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAiBjI;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAqBvI;AAED,wBAAsB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAQrJ;AAED,wBAAsB,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAQzJ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,QASlE;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,GAAG,cAAc,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE9I,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,CAM5F;AAmBD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,iBAoGrR"}
|