@taylordb/query-builder 0.5.0 → 0.7.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/cjs/@types/internal-types.d.ts +3 -1
- package/dist/cjs/@types/query-builder.d.ts +1 -0
- package/dist/cjs/__tests__/query-builder.spec.js +32 -0
- package/dist/cjs/__tests__/query-builder.spec.js.map +1 -1
- package/dist/cjs/where-query-builder.d.ts +9 -7
- package/dist/cjs/where-query-builder.js +46 -17
- package/dist/cjs/where-query-builder.js.map +1 -1
- package/dist/esm/@types/internal-types.d.ts +3 -1
- package/dist/esm/@types/query-builder.d.ts +1 -0
- package/dist/esm/__tests__/query-builder.spec.js +32 -0
- package/dist/esm/__tests__/query-builder.spec.js.map +1 -1
- package/dist/esm/where-query-builder.d.ts +9 -7
- package/dist/esm/where-query-builder.js +46 -17
- package/dist/esm/where-query-builder.js.map +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ColumnType, MetadataWithTableName, ObjConfigurationVisibleField, SelectQueryMetaData } from '@taylordb/shared';
|
|
1
|
+
import { ColumnType, Filters, MetadataWithTableName, ObjConfigurationVisibleField, SelectQueryMetaData } from '@taylordb/shared';
|
|
2
2
|
export type AnyDB = {
|
|
3
3
|
[key in keyof any]: {
|
|
4
4
|
[key in keyof any]: ColumnType<any, any, any, any, any, any>;
|
|
@@ -12,3 +12,5 @@ export type RootQueryNode = Omit<MetadataWithTableName<SelectQueryMetaData>, 'fi
|
|
|
12
12
|
queryType: 'root';
|
|
13
13
|
};
|
|
14
14
|
export type QueryNode = SelectionQueryNode | RootQueryNode;
|
|
15
|
+
export type FilterableNode = Pick<QueryNode, 'filtersSet'>;
|
|
16
|
+
export type Filter = Filters<string>;
|
|
@@ -125,5 +125,37 @@ describe('QueryBuilder', () => {
|
|
|
125
125
|
},
|
|
126
126
|
});
|
|
127
127
|
});
|
|
128
|
+
it('should compile a cross-filter query', () => {
|
|
129
|
+
const { variables } = qb
|
|
130
|
+
.selectFrom('customers')
|
|
131
|
+
.where('orders', 'hasAnyOf', qb => qb.where('amount', '>', 100))
|
|
132
|
+
.compile();
|
|
133
|
+
expect(variables.metadata[0]).toMatchObject({
|
|
134
|
+
type: 'select',
|
|
135
|
+
tableName: 'customers',
|
|
136
|
+
filtersSet: {
|
|
137
|
+
conjunction: 'and',
|
|
138
|
+
filtersSet: [
|
|
139
|
+
{
|
|
140
|
+
field: 'orders',
|
|
141
|
+
operator: 'hasAnyOf',
|
|
142
|
+
value: [
|
|
143
|
+
'cross-filter',
|
|
144
|
+
{
|
|
145
|
+
conjunction: 'and',
|
|
146
|
+
filtersSet: [
|
|
147
|
+
{
|
|
148
|
+
field: 'amount',
|
|
149
|
+
operator: '>',
|
|
150
|
+
value: 100,
|
|
151
|
+
},
|
|
152
|
+
],
|
|
153
|
+
},
|
|
154
|
+
],
|
|
155
|
+
},
|
|
156
|
+
],
|
|
157
|
+
},
|
|
158
|
+
});
|
|
159
|
+
});
|
|
128
160
|
});
|
|
129
161
|
//# sourceMappingURL=query-builder.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.spec.js","sourceRoot":"","sources":["../../../src/__tests__/query-builder.spec.ts"],"names":[],"mappings":";;AAAA,0CAAiD;
|
|
1
|
+
{"version":3,"file":"query-builder.spec.js","sourceRoot":"","sources":["../../../src/__tests__/query-builder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { LinkColumnType } from '@taylordb/shared';
|
|
2
|
+
import { AnyDB, FilterableNode } from './@types/internal-types.js';
|
|
3
|
+
import { ColumnNames } from './@types/query-builder.js';
|
|
2
4
|
import { Executor } from './executor.js';
|
|
3
5
|
export declare class FilterableQueryBuilder<DB extends AnyDB, TableName extends keyof DB> {
|
|
4
|
-
_node:
|
|
6
|
+
_node: FilterableNode;
|
|
5
7
|
_executor: Executor;
|
|
6
|
-
constructor(node:
|
|
7
|
-
where<
|
|
8
|
-
where<C extends (builder: WhereQueryBuilder<DB, TableName>) =>
|
|
9
|
-
orWhere<
|
|
10
|
-
orWhere<C extends (builder: WhereQueryBuilder<DB, TableName>) =>
|
|
8
|
+
constructor(node: FilterableNode, executor: Executor);
|
|
9
|
+
where<TField extends ColumnNames<DB[TableName]> & string, TOperator extends keyof DB[TableName][TField]['filters']>(field: TField, operator: TOperator, value: DB[TableName][TField] extends LinkColumnType<any> ? ((qb: FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) => FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) | DB[TableName][TField]['filters'][TOperator] : DB[TableName][TField]['filters'][TOperator]): this;
|
|
10
|
+
where<C extends (builder: WhereQueryBuilder<DB, TableName>) => WhereQueryBuilder<DB, TableName>>(column: C): this;
|
|
11
|
+
orWhere<TField extends ColumnNames<DB[TableName]> & string, TOperator extends keyof DB[TableName][TField]['filters']>(field: TField, operator: TOperator, value: DB[TableName][TField] extends LinkColumnType<any> ? (qb: FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) => FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never> | DB[TableName][TField]['filters'][TOperator] : DB[TableName][TField]['filters'][TOperator]): this;
|
|
12
|
+
orWhere<C extends (builder: WhereQueryBuilder<DB, TableName>) => WhereQueryBuilder<DB, TableName>>(column: C): this;
|
|
11
13
|
}
|
|
12
14
|
export declare class WhereQueryBuilder<DB extends AnyDB, TableName extends keyof DB> extends FilterableQueryBuilder<DB, TableName> {
|
|
13
15
|
}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WhereQueryBuilder = exports.FilterableQueryBuilder = void 0;
|
|
4
|
+
const selection_builder_js_1 = require("./selection-builder.js");
|
|
4
5
|
class FilterableQueryBuilder {
|
|
5
|
-
_node;
|
|
6
6
|
_executor;
|
|
7
7
|
constructor(node, executor) {
|
|
8
8
|
this._node = node;
|
|
9
9
|
this._executor = executor;
|
|
10
10
|
}
|
|
11
|
-
where(
|
|
12
|
-
if (typeof
|
|
11
|
+
where(fieldOrFn, operator, value) {
|
|
12
|
+
if (typeof fieldOrFn === 'function') {
|
|
13
13
|
const builder = new WhereQueryBuilder({
|
|
14
14
|
...this._node,
|
|
15
15
|
filtersSet: { conjunction: 'and', filtersSet: [] },
|
|
16
16
|
}, this._executor);
|
|
17
|
-
const result =
|
|
18
|
-
|
|
17
|
+
const result = fieldOrFn(builder);
|
|
18
|
+
const newNode = {
|
|
19
19
|
...this._node,
|
|
20
20
|
filtersSet: {
|
|
21
21
|
...this._node.filtersSet,
|
|
@@ -24,34 +24,63 @@ class FilterableQueryBuilder {
|
|
|
24
24
|
result._node.filtersSet,
|
|
25
25
|
],
|
|
26
26
|
},
|
|
27
|
-
}
|
|
27
|
+
};
|
|
28
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
29
|
+
return new this.constructor(newNode, this._executor);
|
|
28
30
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
if (typeof value === 'function') {
|
|
32
|
+
const selectionBuilder = new selection_builder_js_1.SelectionBuilder(this._executor);
|
|
33
|
+
const initialSubQueryBuilder = selectionBuilder.useLink(fieldOrFn);
|
|
34
|
+
const configuredSubQueryBuilder = value(initialSubQueryBuilder);
|
|
35
|
+
const newFilter = {
|
|
36
|
+
field: fieldOrFn,
|
|
37
|
+
operator: operator,
|
|
38
|
+
value: ['cross-filter', configuredSubQueryBuilder._node.filtersSet],
|
|
39
|
+
};
|
|
40
|
+
const newNode = {
|
|
41
|
+
...this._node,
|
|
42
|
+
filtersSet: {
|
|
43
|
+
...this._node.filtersSet,
|
|
44
|
+
filtersSet: [...this._node.filtersSet.filtersSet, newFilter],
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
48
|
+
return new this.constructor(newNode, this._executor);
|
|
49
|
+
}
|
|
50
|
+
const newFilter = {
|
|
51
|
+
field: fieldOrFn,
|
|
52
|
+
operator: operator,
|
|
32
53
|
value,
|
|
33
54
|
};
|
|
34
|
-
|
|
55
|
+
const newNode = {
|
|
35
56
|
...this._node,
|
|
36
57
|
filtersSet: {
|
|
37
58
|
...this._node.filtersSet,
|
|
38
|
-
filtersSet: [...this._node.filtersSet.filtersSet,
|
|
59
|
+
filtersSet: [...this._node.filtersSet.filtersSet, newFilter],
|
|
39
60
|
},
|
|
40
|
-
}
|
|
61
|
+
};
|
|
62
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
63
|
+
return new this.constructor(newNode, this._executor);
|
|
41
64
|
}
|
|
42
|
-
orWhere(
|
|
65
|
+
orWhere(fieldOrFn, operator, value) {
|
|
66
|
+
// Keeping a basic implementation for orWhere from what was in the file
|
|
43
67
|
const newFilters = this._node.filtersSet.filtersSet;
|
|
44
|
-
if (typeof
|
|
68
|
+
if (typeof fieldOrFn === 'function') {
|
|
45
69
|
const builder = new WhereQueryBuilder({
|
|
46
70
|
...this._node,
|
|
47
71
|
filtersSet: { conjunction: 'and', filtersSet: [] },
|
|
48
72
|
}, this._executor);
|
|
49
|
-
const result =
|
|
50
|
-
newFilters.push(result._node.
|
|
73
|
+
const result = fieldOrFn(builder);
|
|
74
|
+
newFilters.push(result._node.filtersSet);
|
|
51
75
|
}
|
|
52
76
|
else {
|
|
53
|
-
newFilters.push({
|
|
77
|
+
newFilters.push({
|
|
78
|
+
field: fieldOrFn,
|
|
79
|
+
operator: operator,
|
|
80
|
+
value,
|
|
81
|
+
});
|
|
54
82
|
}
|
|
83
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
55
84
|
return new this.constructor({
|
|
56
85
|
...this._node,
|
|
57
86
|
filtersSet: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"where-query-builder.js","sourceRoot":"","sources":["../../src/where-query-builder.ts"],"names":[],"mappings":";;;AAIA,MAAa,sBAAsB;
|
|
1
|
+
{"version":3,"file":"where-query-builder.js","sourceRoot":"","sources":["../../src/where-query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ColumnType, MetadataWithTableName, ObjConfigurationVisibleField, SelectQueryMetaData } from '@taylordb/shared';
|
|
1
|
+
import { ColumnType, Filters, MetadataWithTableName, ObjConfigurationVisibleField, SelectQueryMetaData } from '@taylordb/shared';
|
|
2
2
|
export type AnyDB = {
|
|
3
3
|
[key in keyof any]: {
|
|
4
4
|
[key in keyof any]: ColumnType<any, any, any, any, any, any>;
|
|
@@ -12,3 +12,5 @@ export type RootQueryNode = Omit<MetadataWithTableName<SelectQueryMetaData>, 'fi
|
|
|
12
12
|
queryType: 'root';
|
|
13
13
|
};
|
|
14
14
|
export type QueryNode = SelectionQueryNode | RootQueryNode;
|
|
15
|
+
export type FilterableNode = Pick<QueryNode, 'filtersSet'>;
|
|
16
|
+
export type Filter = Filters<string>;
|
|
@@ -123,5 +123,37 @@ describe('QueryBuilder', () => {
|
|
|
123
123
|
},
|
|
124
124
|
});
|
|
125
125
|
});
|
|
126
|
+
it('should compile a cross-filter query', () => {
|
|
127
|
+
const { variables } = qb
|
|
128
|
+
.selectFrom('customers')
|
|
129
|
+
.where('orders', 'hasAnyOf', qb => qb.where('amount', '>', 100))
|
|
130
|
+
.compile();
|
|
131
|
+
expect(variables.metadata[0]).toMatchObject({
|
|
132
|
+
type: 'select',
|
|
133
|
+
tableName: 'customers',
|
|
134
|
+
filtersSet: {
|
|
135
|
+
conjunction: 'and',
|
|
136
|
+
filtersSet: [
|
|
137
|
+
{
|
|
138
|
+
field: 'orders',
|
|
139
|
+
operator: 'hasAnyOf',
|
|
140
|
+
value: [
|
|
141
|
+
'cross-filter',
|
|
142
|
+
{
|
|
143
|
+
conjunction: 'and',
|
|
144
|
+
filtersSet: [
|
|
145
|
+
{
|
|
146
|
+
field: 'amount',
|
|
147
|
+
operator: '>',
|
|
148
|
+
value: 100,
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
},
|
|
152
|
+
],
|
|
153
|
+
},
|
|
154
|
+
],
|
|
155
|
+
},
|
|
156
|
+
});
|
|
157
|
+
});
|
|
126
158
|
});
|
|
127
159
|
//# sourceMappingURL=query-builder.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.spec.js","sourceRoot":"","sources":["../../../src/__tests__/query-builder.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"query-builder.spec.js","sourceRoot":"","sources":["../../../src/__tests__/query-builder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { LinkColumnType } from '@taylordb/shared';
|
|
2
|
+
import { AnyDB, FilterableNode } from './@types/internal-types.js';
|
|
3
|
+
import { ColumnNames } from './@types/query-builder.js';
|
|
2
4
|
import { Executor } from './executor.js';
|
|
3
5
|
export declare class FilterableQueryBuilder<DB extends AnyDB, TableName extends keyof DB> {
|
|
4
|
-
_node:
|
|
6
|
+
_node: FilterableNode;
|
|
5
7
|
_executor: Executor;
|
|
6
|
-
constructor(node:
|
|
7
|
-
where<
|
|
8
|
-
where<C extends (builder: WhereQueryBuilder<DB, TableName>) =>
|
|
9
|
-
orWhere<
|
|
10
|
-
orWhere<C extends (builder: WhereQueryBuilder<DB, TableName>) =>
|
|
8
|
+
constructor(node: FilterableNode, executor: Executor);
|
|
9
|
+
where<TField extends ColumnNames<DB[TableName]> & string, TOperator extends keyof DB[TableName][TField]['filters']>(field: TField, operator: TOperator, value: DB[TableName][TField] extends LinkColumnType<any> ? ((qb: FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) => FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) | DB[TableName][TField]['filters'][TOperator] : DB[TableName][TField]['filters'][TOperator]): this;
|
|
10
|
+
where<C extends (builder: WhereQueryBuilder<DB, TableName>) => WhereQueryBuilder<DB, TableName>>(column: C): this;
|
|
11
|
+
orWhere<TField extends ColumnNames<DB[TableName]> & string, TOperator extends keyof DB[TableName][TField]['filters']>(field: TField, operator: TOperator, value: DB[TableName][TField] extends LinkColumnType<any> ? (qb: FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never>) => FilterableQueryBuilder<DB, DB[TableName][TField] extends LinkColumnType<any> ? DB[TableName][TField]['linkedTo'] : never> | DB[TableName][TField]['filters'][TOperator] : DB[TableName][TField]['filters'][TOperator]): this;
|
|
12
|
+
orWhere<C extends (builder: WhereQueryBuilder<DB, TableName>) => WhereQueryBuilder<DB, TableName>>(column: C): this;
|
|
11
13
|
}
|
|
12
14
|
export declare class WhereQueryBuilder<DB extends AnyDB, TableName extends keyof DB> extends FilterableQueryBuilder<DB, TableName> {
|
|
13
15
|
}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
+
import { SelectionBuilder } from './selection-builder.js';
|
|
1
2
|
export class FilterableQueryBuilder {
|
|
2
|
-
_node;
|
|
3
3
|
_executor;
|
|
4
4
|
constructor(node, executor) {
|
|
5
5
|
this._node = node;
|
|
6
6
|
this._executor = executor;
|
|
7
7
|
}
|
|
8
|
-
where(
|
|
9
|
-
if (typeof
|
|
8
|
+
where(fieldOrFn, operator, value) {
|
|
9
|
+
if (typeof fieldOrFn === 'function') {
|
|
10
10
|
const builder = new WhereQueryBuilder({
|
|
11
11
|
...this._node,
|
|
12
12
|
filtersSet: { conjunction: 'and', filtersSet: [] },
|
|
13
13
|
}, this._executor);
|
|
14
|
-
const result =
|
|
15
|
-
|
|
14
|
+
const result = fieldOrFn(builder);
|
|
15
|
+
const newNode = {
|
|
16
16
|
...this._node,
|
|
17
17
|
filtersSet: {
|
|
18
18
|
...this._node.filtersSet,
|
|
@@ -21,34 +21,63 @@ export class FilterableQueryBuilder {
|
|
|
21
21
|
result._node.filtersSet,
|
|
22
22
|
],
|
|
23
23
|
},
|
|
24
|
-
}
|
|
24
|
+
};
|
|
25
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
26
|
+
return new this.constructor(newNode, this._executor);
|
|
25
27
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
if (typeof value === 'function') {
|
|
29
|
+
const selectionBuilder = new SelectionBuilder(this._executor);
|
|
30
|
+
const initialSubQueryBuilder = selectionBuilder.useLink(fieldOrFn);
|
|
31
|
+
const configuredSubQueryBuilder = value(initialSubQueryBuilder);
|
|
32
|
+
const newFilter = {
|
|
33
|
+
field: fieldOrFn,
|
|
34
|
+
operator: operator,
|
|
35
|
+
value: ['cross-filter', configuredSubQueryBuilder._node.filtersSet],
|
|
36
|
+
};
|
|
37
|
+
const newNode = {
|
|
38
|
+
...this._node,
|
|
39
|
+
filtersSet: {
|
|
40
|
+
...this._node.filtersSet,
|
|
41
|
+
filtersSet: [...this._node.filtersSet.filtersSet, newFilter],
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
45
|
+
return new this.constructor(newNode, this._executor);
|
|
46
|
+
}
|
|
47
|
+
const newFilter = {
|
|
48
|
+
field: fieldOrFn,
|
|
49
|
+
operator: operator,
|
|
29
50
|
value,
|
|
30
51
|
};
|
|
31
|
-
|
|
52
|
+
const newNode = {
|
|
32
53
|
...this._node,
|
|
33
54
|
filtersSet: {
|
|
34
55
|
...this._node.filtersSet,
|
|
35
|
-
filtersSet: [...this._node.filtersSet.filtersSet,
|
|
56
|
+
filtersSet: [...this._node.filtersSet.filtersSet, newFilter],
|
|
36
57
|
},
|
|
37
|
-
}
|
|
58
|
+
};
|
|
59
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
60
|
+
return new this.constructor(newNode, this._executor);
|
|
38
61
|
}
|
|
39
|
-
orWhere(
|
|
62
|
+
orWhere(fieldOrFn, operator, value) {
|
|
63
|
+
// Keeping a basic implementation for orWhere from what was in the file
|
|
40
64
|
const newFilters = this._node.filtersSet.filtersSet;
|
|
41
|
-
if (typeof
|
|
65
|
+
if (typeof fieldOrFn === 'function') {
|
|
42
66
|
const builder = new WhereQueryBuilder({
|
|
43
67
|
...this._node,
|
|
44
68
|
filtersSet: { conjunction: 'and', filtersSet: [] },
|
|
45
69
|
}, this._executor);
|
|
46
|
-
const result =
|
|
47
|
-
newFilters.push(result._node.
|
|
70
|
+
const result = fieldOrFn(builder);
|
|
71
|
+
newFilters.push(result._node.filtersSet);
|
|
48
72
|
}
|
|
49
73
|
else {
|
|
50
|
-
newFilters.push({
|
|
74
|
+
newFilters.push({
|
|
75
|
+
field: fieldOrFn,
|
|
76
|
+
operator: operator,
|
|
77
|
+
value,
|
|
78
|
+
});
|
|
51
79
|
}
|
|
80
|
+
// @ts-expect-error cannot instantiate an abstract class
|
|
52
81
|
return new this.constructor({
|
|
53
82
|
...this._node,
|
|
54
83
|
filtersSet: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"where-query-builder.js","sourceRoot":"","sources":["../../src/where-query-builder.ts"],"names":[],"mappings":"AAIA,MAAM,
|
|
1
|
+
{"version":3,"file":"where-query-builder.js","sourceRoot":"","sources":["../../src/where-query-builder.ts"],"names":[],"mappings":"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"}
|