@omnia/fx-models 7.8.127-preview → 7.8.128-preview
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/QueryFilter.d.ts +8 -8
- package/QueryFilter.js +8 -8
- package/filterbuilder/FilterBuilder.d.ts +15 -17
- package/filterbuilder/FilterBuilder.js +8 -8
- package/filterbuilder/FilterComponent.d.ts +2 -2
- package/filterbuilder/FilterComponent.js +2 -2
- package/filterbuilder/FilterOperatorBuilder.d.ts +12 -13
- package/filterbuilder/FilterOperatorBuilder.js +16 -16
- package/filterbuilder/helper/FilterHelper.d.ts +4 -4
- package/filterbuilder/helper/FilterHelper.js +5 -5
- package/filterbuilder/transformers/OmniaSearchFilterTransformer.js +10 -10
- package/filterengine/Shared.d.ts +1 -1
- package/package.json +1 -1
package/QueryFilter.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
export declare enum FilterOperator {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
Equal = 1,
|
|
3
|
+
NotEqual = 2,
|
|
4
|
+
LessThan = 3,
|
|
5
|
+
GreaterThan = 4,
|
|
6
|
+
LessThanOrEqual = 5,
|
|
7
|
+
GreaterThanOrEqual = 6,
|
|
8
8
|
In = 7,
|
|
9
9
|
Like = 8,
|
|
10
10
|
NotLike = 9,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
BitwiseAnd = 10,
|
|
12
|
+
BitwiseNotAnd = 11,
|
|
13
13
|
NotIn = 12
|
|
14
14
|
}
|
|
15
15
|
export declare enum FilterLogicalOperator {
|
package/QueryFilter.js
CHANGED
|
@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FilterLogicalOperator = exports.FilterOperator = void 0;
|
|
4
4
|
var FilterOperator;
|
|
5
5
|
(function (FilterOperator) {
|
|
6
|
-
FilterOperator[FilterOperator["
|
|
7
|
-
FilterOperator[FilterOperator["
|
|
8
|
-
FilterOperator[FilterOperator["
|
|
9
|
-
FilterOperator[FilterOperator["
|
|
10
|
-
FilterOperator[FilterOperator["
|
|
11
|
-
FilterOperator[FilterOperator["
|
|
6
|
+
FilterOperator[FilterOperator["Equal"] = 1] = "Equal";
|
|
7
|
+
FilterOperator[FilterOperator["NotEqual"] = 2] = "NotEqual";
|
|
8
|
+
FilterOperator[FilterOperator["LessThan"] = 3] = "LessThan";
|
|
9
|
+
FilterOperator[FilterOperator["GreaterThan"] = 4] = "GreaterThan";
|
|
10
|
+
FilterOperator[FilterOperator["LessThanOrEqual"] = 5] = "LessThanOrEqual";
|
|
11
|
+
FilterOperator[FilterOperator["GreaterThanOrEqual"] = 6] = "GreaterThanOrEqual";
|
|
12
12
|
FilterOperator[FilterOperator["In"] = 7] = "In";
|
|
13
13
|
FilterOperator[FilterOperator["Like"] = 8] = "Like";
|
|
14
14
|
FilterOperator[FilterOperator["NotLike"] = 9] = "NotLike";
|
|
15
|
-
FilterOperator[FilterOperator["
|
|
16
|
-
FilterOperator[FilterOperator["
|
|
15
|
+
FilterOperator[FilterOperator["BitwiseAnd"] = 10] = "BitwiseAnd";
|
|
16
|
+
FilterOperator[FilterOperator["BitwiseNotAnd"] = 11] = "BitwiseNotAnd";
|
|
17
17
|
FilterOperator[FilterOperator["NotIn"] = 12] = "NotIn";
|
|
18
18
|
})(FilterOperator = exports.FilterOperator || (exports.FilterOperator = {}));
|
|
19
19
|
var FilterLogicalOperator;
|
|
@@ -2,22 +2,20 @@ import { FilterLogicalOperator } from "../QueryFilter";
|
|
|
2
2
|
import { FilterComponent } from "./FilterComponent";
|
|
3
3
|
import { IBooleanFilterOperatorBuilder, IDateTimeFilterOperatorBuilder, IDateTimeOffsetFilterOperatorBuilder, IFloatFilterOperatorBuilder, IIntFilterOperatorBuilder, IStringFilterOperatorBuilder } from "./FilterOperatorBuilder";
|
|
4
4
|
export interface IFilterComponentBuilder {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
int(propertyName: string): IIntFilterOperatorBuilder;
|
|
6
|
+
float(propertyName: string): IFloatFilterOperatorBuilder;
|
|
7
|
+
dateTime(propertyName: string): IDateTimeFilterOperatorBuilder;
|
|
8
|
+
dateTimeOffset(propertyName: string): IDateTimeOffsetFilterOperatorBuilder;
|
|
9
|
+
string(propertyName: string): IStringFilterOperatorBuilder;
|
|
10
|
+
boolean(propertyName: string): IBooleanFilterOperatorBuilder;
|
|
11
11
|
expression(buildInnerExpression: (builder: IFilterComponentBuilder) => IFilterLogicalOperatorBuilder): IFilterLogicalOperatorBuilder;
|
|
12
12
|
}
|
|
13
13
|
export interface IFilterLogicalOperatorBuilder {
|
|
14
14
|
and(): IFilterComponentBuilder;
|
|
15
15
|
or(): IFilterComponentBuilder;
|
|
16
|
-
|
|
16
|
+
build(): FilterComponent[];
|
|
17
17
|
}
|
|
18
|
-
export
|
|
19
|
-
}
|
|
20
|
-
export declare class FilterBuilder implements IFilterBuilder {
|
|
18
|
+
export declare class FilterBuilder implements IFilterComponentBuilder, IFilterLogicalOperatorBuilder {
|
|
21
19
|
private filters;
|
|
22
20
|
private intFilterOperatorBuilder?;
|
|
23
21
|
private floatFilterOperatorBuilder?;
|
|
@@ -31,12 +29,12 @@ export declare class FilterBuilder implements IFilterBuilder {
|
|
|
31
29
|
addFilter(filterComponent: FilterComponent): void;
|
|
32
30
|
and(): IFilterComponentBuilder;
|
|
33
31
|
or(): IFilterComponentBuilder;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
32
|
+
build(): FilterComponent[];
|
|
33
|
+
int(propertyName: string): IIntFilterOperatorBuilder;
|
|
34
|
+
float(propertyName: string): IFloatFilterOperatorBuilder;
|
|
35
|
+
dateTime(propertyName: string): IDateTimeFilterOperatorBuilder;
|
|
36
|
+
dateTimeOffset(propertyName: string): IDateTimeOffsetFilterOperatorBuilder;
|
|
37
|
+
string(propertyName: string): IStringFilterOperatorBuilder;
|
|
38
|
+
boolean(propertyName: string): IBooleanFilterOperatorBuilder;
|
|
41
39
|
expression(buildInnerExpression: (builder: IFilterComponentBuilder) => IFilterLogicalOperatorBuilder): IFilterLogicalOperatorBuilder;
|
|
42
40
|
}
|
|
@@ -25,40 +25,40 @@ class FilterBuilder {
|
|
|
25
25
|
this.filterLogicalOperator = QueryFilter_1.FilterLogicalOperator.Or;
|
|
26
26
|
return this;
|
|
27
27
|
}
|
|
28
|
-
|
|
28
|
+
build() {
|
|
29
29
|
return this.filters;
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
int(propertyName) {
|
|
32
32
|
this.propertyName = propertyName;
|
|
33
33
|
this.intFilterOperatorBuilder =
|
|
34
34
|
this.intFilterOperatorBuilder || new FilterOperatorBuilder_1.IntFilterOperatorBuilder(this);
|
|
35
35
|
return this.intFilterOperatorBuilder;
|
|
36
36
|
}
|
|
37
|
-
|
|
37
|
+
float(propertyName) {
|
|
38
38
|
this.propertyName = propertyName;
|
|
39
39
|
this.floatFilterOperatorBuilder =
|
|
40
40
|
this.floatFilterOperatorBuilder || new FilterOperatorBuilder_1.FloatFilterOperatorBuilder(this);
|
|
41
41
|
return this.floatFilterOperatorBuilder;
|
|
42
42
|
}
|
|
43
|
-
|
|
43
|
+
dateTime(propertyName) {
|
|
44
44
|
this.propertyName = propertyName;
|
|
45
45
|
this.dateTimeFilterOperatorBuilder =
|
|
46
46
|
this.dateTimeFilterOperatorBuilder || new FilterOperatorBuilder_1.DateTimeFilterOperatorBuilder(this);
|
|
47
47
|
return this.dateTimeFilterOperatorBuilder;
|
|
48
48
|
}
|
|
49
|
-
|
|
49
|
+
dateTimeOffset(propertyName) {
|
|
50
50
|
this.propertyName = propertyName;
|
|
51
51
|
this.dateTimeOffsetFilterOperatorBuilder =
|
|
52
52
|
this.dateTimeOffsetFilterOperatorBuilder || new FilterOperatorBuilder_1.DateTimeOffsetFilterOperatorBuilder(this);
|
|
53
53
|
return this.dateTimeOffsetFilterOperatorBuilder;
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
string(propertyName) {
|
|
56
56
|
this.propertyName = propertyName;
|
|
57
57
|
this.stringFilterOperatorBuilder =
|
|
58
58
|
this.stringFilterOperatorBuilder || new FilterOperatorBuilder_1.StringFilterOperatorBuilder(this);
|
|
59
59
|
return this.stringFilterOperatorBuilder;
|
|
60
60
|
}
|
|
61
|
-
|
|
61
|
+
boolean(propertyName) {
|
|
62
62
|
this.propertyName = propertyName;
|
|
63
63
|
this.booleanFilterOperatorBuilder =
|
|
64
64
|
this.booleanFilterOperatorBuilder || new FilterOperatorBuilder_1.BooleanFilterOperatorBuilder(this);
|
|
@@ -66,7 +66,7 @@ class FilterBuilder {
|
|
|
66
66
|
}
|
|
67
67
|
expression(buildInnerExpression) {
|
|
68
68
|
const innerFilterBuilder = new FilterBuilder([]);
|
|
69
|
-
const innerFilters = buildInnerExpression(innerFilterBuilder).
|
|
69
|
+
const innerFilters = buildInnerExpression(innerFilterBuilder).build();
|
|
70
70
|
if (innerFilters.length === 0) {
|
|
71
71
|
throw new Error("There must be at least 1 filter in the expression.");
|
|
72
72
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FilterLogicalOperator, FilterOperator } from "../QueryFilter";
|
|
2
2
|
export declare enum FilterComponentType {
|
|
3
|
-
Condition =
|
|
4
|
-
Expression =
|
|
3
|
+
Condition = 1,
|
|
4
|
+
Expression = 2
|
|
5
5
|
}
|
|
6
6
|
export interface FilterComponent {
|
|
7
7
|
filterLogicalOperator: FilterLogicalOperator;
|
|
@@ -4,8 +4,8 @@ exports.FilterExpressionComponent = exports.FilterConditionComponent = exports.F
|
|
|
4
4
|
const QueryFilter_1 = require("../QueryFilter");
|
|
5
5
|
var FilterComponentType;
|
|
6
6
|
(function (FilterComponentType) {
|
|
7
|
-
FilterComponentType[FilterComponentType["Condition"] =
|
|
8
|
-
FilterComponentType[FilterComponentType["Expression"] =
|
|
7
|
+
FilterComponentType[FilterComponentType["Condition"] = 1] = "Condition";
|
|
8
|
+
FilterComponentType[FilterComponentType["Expression"] = 2] = "Expression";
|
|
9
9
|
})(FilterComponentType = exports.FilterComponentType || (exports.FilterComponentType = {}));
|
|
10
10
|
class FilterConditionComponent {
|
|
11
11
|
constructor(propertyName, filterOperator, values, filterLogicalOperator = QueryFilter_1.FilterLogicalOperator.And) {
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
import { FilterBuilder, IFilterLogicalOperatorBuilder } from "./FilterBuilder";
|
|
2
2
|
export interface IFilterOperatorBuilder<T> {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
ne(value: T): IFilterLogicalOperatorBuilder;
|
|
3
|
+
equals(value: T): IFilterLogicalOperatorBuilder;
|
|
4
|
+
notEquals(value: T): IFilterLogicalOperatorBuilder;
|
|
6
5
|
isNull(): IFilterLogicalOperatorBuilder;
|
|
7
6
|
isNotNull(): IFilterLogicalOperatorBuilder;
|
|
8
7
|
in(values: T[]): IFilterLogicalOperatorBuilder;
|
|
9
8
|
notIn(values: T[]): IFilterLogicalOperatorBuilder;
|
|
10
9
|
}
|
|
11
10
|
export interface IComparableFilterOperatorBuilder<T> extends IFilterOperatorBuilder<T> {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
lessThan(value: T): IFilterLogicalOperatorBuilder;
|
|
12
|
+
greaterThan(value: T): IFilterLogicalOperatorBuilder;
|
|
13
|
+
lessThanOrEqual(value: T): IFilterLogicalOperatorBuilder;
|
|
14
|
+
greaterThanOrEqual(value: T): IFilterLogicalOperatorBuilder;
|
|
16
15
|
}
|
|
17
16
|
export interface IIntFilterOperatorBuilder extends IComparableFilterOperatorBuilder<number> {
|
|
18
17
|
bitwiseAnd(value: number): IFilterLogicalOperatorBuilder;
|
|
@@ -33,8 +32,8 @@ export interface IStringFilterOperatorBuilder extends IFilterOperatorBuilder<str
|
|
|
33
32
|
export declare class FilterOperatorBuilder<T> implements IFilterOperatorBuilder<T> {
|
|
34
33
|
protected readonly filterBuilder: FilterBuilder;
|
|
35
34
|
constructor(filterBuilder: FilterBuilder);
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
equals(value: T): IFilterLogicalOperatorBuilder;
|
|
36
|
+
notEquals(value: T): IFilterLogicalOperatorBuilder;
|
|
38
37
|
notIn(values: T[]): IFilterLogicalOperatorBuilder;
|
|
39
38
|
in(values: T[]): IFilterLogicalOperatorBuilder;
|
|
40
39
|
isNull(): IFilterLogicalOperatorBuilder;
|
|
@@ -45,10 +44,10 @@ export declare class StringFilterOperatorBuilder extends FilterOperatorBuilder<s
|
|
|
45
44
|
notLike(value: string): IFilterLogicalOperatorBuilder;
|
|
46
45
|
}
|
|
47
46
|
export declare class ComparableFilterOperatorBuilder<T> extends FilterOperatorBuilder<T> implements IComparableFilterOperatorBuilder<T> {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
greaterThanOrEqual(value: T): IFilterLogicalOperatorBuilder;
|
|
48
|
+
greaterThan(value: T): IFilterLogicalOperatorBuilder;
|
|
49
|
+
lessThanOrEqual(value: T): IFilterLogicalOperatorBuilder;
|
|
50
|
+
lessThan(value: T): IFilterLogicalOperatorBuilder;
|
|
52
51
|
}
|
|
53
52
|
export declare class IntFilterOperatorBuilder extends ComparableFilterOperatorBuilder<number> implements IIntFilterOperatorBuilder {
|
|
54
53
|
bitwiseAnd(value: number): IFilterLogicalOperatorBuilder;
|
|
@@ -10,12 +10,12 @@ class FilterOperatorBuilder {
|
|
|
10
10
|
}
|
|
11
11
|
this.filterBuilder = filterBuilder;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
13
|
+
equals(value) {
|
|
14
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.Equal, [value], this.filterBuilder.filterLogicalOperator));
|
|
15
15
|
return this.filterBuilder;
|
|
16
16
|
}
|
|
17
|
-
|
|
18
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
17
|
+
notEquals(value) {
|
|
18
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.NotEqual, [value], this.filterBuilder.filterLogicalOperator));
|
|
19
19
|
return this.filterBuilder;
|
|
20
20
|
}
|
|
21
21
|
notIn(values) {
|
|
@@ -27,11 +27,11 @@ class FilterOperatorBuilder {
|
|
|
27
27
|
return this.filterBuilder;
|
|
28
28
|
}
|
|
29
29
|
isNull() {
|
|
30
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
30
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.Equal, null, this.filterBuilder.filterLogicalOperator));
|
|
31
31
|
return this.filterBuilder;
|
|
32
32
|
}
|
|
33
33
|
isNotNull() {
|
|
34
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
34
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.NotEqual, null, this.filterBuilder.filterLogicalOperator));
|
|
35
35
|
return this.filterBuilder;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
@@ -48,31 +48,31 @@ class StringFilterOperatorBuilder extends FilterOperatorBuilder {
|
|
|
48
48
|
}
|
|
49
49
|
exports.StringFilterOperatorBuilder = StringFilterOperatorBuilder;
|
|
50
50
|
class ComparableFilterOperatorBuilder extends FilterOperatorBuilder {
|
|
51
|
-
|
|
52
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
51
|
+
greaterThanOrEqual(value) {
|
|
52
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.GreaterThanOrEqual, [value], this.filterBuilder.filterLogicalOperator));
|
|
53
53
|
return this.filterBuilder;
|
|
54
54
|
}
|
|
55
|
-
|
|
56
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
55
|
+
greaterThan(value) {
|
|
56
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.GreaterThan, [value], this.filterBuilder.filterLogicalOperator));
|
|
57
57
|
return this.filterBuilder;
|
|
58
58
|
}
|
|
59
|
-
|
|
60
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
59
|
+
lessThanOrEqual(value) {
|
|
60
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.LessThanOrEqual, [value], this.filterBuilder.filterLogicalOperator));
|
|
61
61
|
return this.filterBuilder;
|
|
62
62
|
}
|
|
63
|
-
|
|
64
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
63
|
+
lessThan(value) {
|
|
64
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.LessThan, [value], this.filterBuilder.filterLogicalOperator));
|
|
65
65
|
return this.filterBuilder;
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
exports.ComparableFilterOperatorBuilder = ComparableFilterOperatorBuilder;
|
|
69
69
|
class IntFilterOperatorBuilder extends ComparableFilterOperatorBuilder {
|
|
70
70
|
bitwiseAnd(value) {
|
|
71
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
71
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.BitwiseAnd, [value], this.filterBuilder.filterLogicalOperator));
|
|
72
72
|
return this.filterBuilder;
|
|
73
73
|
}
|
|
74
74
|
bitwiseNotAnd(value) {
|
|
75
|
-
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.
|
|
75
|
+
this.filterBuilder.addFilter(new FilterComponent_1.FilterConditionComponent(this.filterBuilder.propertyName, QueryFilter_1.FilterOperator.BitwiseNotAnd, [value], this.filterBuilder.filterLogicalOperator));
|
|
76
76
|
return this.filterBuilder;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FilterBuilder } from "../FilterBuilder";
|
|
2
2
|
import { FilterComponent } from "../FilterComponent";
|
|
3
|
-
export declare class
|
|
4
|
-
static
|
|
5
|
-
static
|
|
3
|
+
export declare class FilterBuilderFactory {
|
|
4
|
+
static createFilterBuilder(): FilterBuilder;
|
|
5
|
+
static createFilterBuilderWithExisting(filters: FilterComponent[]): FilterBuilder;
|
|
6
6
|
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.FilterBuilderFactory = void 0;
|
|
4
4
|
const FilterBuilder_1 = require("../FilterBuilder");
|
|
5
|
-
class
|
|
6
|
-
static
|
|
5
|
+
class FilterBuilderFactory {
|
|
6
|
+
static createFilterBuilder() {
|
|
7
7
|
return new FilterBuilder_1.FilterBuilder();
|
|
8
8
|
}
|
|
9
|
-
static
|
|
9
|
+
static createFilterBuilderWithExisting(filters) {
|
|
10
10
|
return new FilterBuilder_1.FilterBuilder(filters);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
exports.
|
|
13
|
+
exports.FilterBuilderFactory = FilterBuilderFactory;
|
|
@@ -25,10 +25,10 @@ class OmniaSearchFilterTransformer {
|
|
|
25
25
|
let firstValue = null;
|
|
26
26
|
if (!filterCondition.values) {
|
|
27
27
|
valueString = "NULL";
|
|
28
|
-
if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.
|
|
28
|
+
if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.Equal) {
|
|
29
29
|
operatorString = " IS ";
|
|
30
30
|
}
|
|
31
|
-
else if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.
|
|
31
|
+
else if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.NotEqual) {
|
|
32
32
|
operatorString = " IS NOT ";
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
@@ -38,10 +38,10 @@ class OmniaSearchFilterTransformer {
|
|
|
38
38
|
else {
|
|
39
39
|
firstValue = filterCondition.values[0];
|
|
40
40
|
if (firstValue == null) {
|
|
41
|
-
if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.
|
|
41
|
+
if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.Equal) {
|
|
42
42
|
return `(${filterCondition.propertyName} IS NULL OR ${filterCondition.propertyName} IS EMPTY OR ${filterCondition.propertyName} NOT EXISTS)`;
|
|
43
43
|
}
|
|
44
|
-
else if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.
|
|
44
|
+
else if (filterCondition.filterOperator === QueryFilter_1.FilterOperator.NotEqual) {
|
|
45
45
|
return `(${filterCondition.propertyName} IS NOT NULL AND ${filterCondition.propertyName} IS NOT EMPTY)`;
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
@@ -50,22 +50,22 @@ class OmniaSearchFilterTransformer {
|
|
|
50
50
|
}
|
|
51
51
|
valueString = this.getQueryStringValue(firstValue);
|
|
52
52
|
switch (filterCondition.filterOperator) {
|
|
53
|
-
case QueryFilter_1.FilterOperator.
|
|
53
|
+
case QueryFilter_1.FilterOperator.Equal:
|
|
54
54
|
operatorString = "=";
|
|
55
55
|
break;
|
|
56
|
-
case QueryFilter_1.FilterOperator.
|
|
56
|
+
case QueryFilter_1.FilterOperator.NotEqual:
|
|
57
57
|
operatorString = "!=";
|
|
58
58
|
break;
|
|
59
|
-
case QueryFilter_1.FilterOperator.
|
|
59
|
+
case QueryFilter_1.FilterOperator.GreaterThan:
|
|
60
60
|
operatorString = ">";
|
|
61
61
|
break;
|
|
62
|
-
case QueryFilter_1.FilterOperator.
|
|
62
|
+
case QueryFilter_1.FilterOperator.LessThan:
|
|
63
63
|
operatorString = "<";
|
|
64
64
|
break;
|
|
65
|
-
case QueryFilter_1.FilterOperator.
|
|
65
|
+
case QueryFilter_1.FilterOperator.GreaterThanOrEqual:
|
|
66
66
|
operatorString = ">=";
|
|
67
67
|
break;
|
|
68
|
-
case QueryFilter_1.FilterOperator.
|
|
68
|
+
case QueryFilter_1.FilterOperator.LessThanOrEqual:
|
|
69
69
|
operatorString = "<=";
|
|
70
70
|
break;
|
|
71
71
|
case QueryFilter_1.FilterOperator.In:
|
package/filterengine/Shared.d.ts
CHANGED
|
@@ -117,7 +117,7 @@ export interface BaseFilterEngineProperty {
|
|
|
117
117
|
entries?: Array<Refinement>;
|
|
118
118
|
}
|
|
119
119
|
export interface TypedFilterEnginePropertyOutput {
|
|
120
|
-
operator: FilterOperator.
|
|
120
|
+
operator: FilterOperator.Equal | FilterOperator.GreaterThan | FilterOperator.LessThan | FilterOperator.NotEqual | FilterOperator.In;
|
|
121
121
|
logicalOperator: FilterLogicalOperator;
|
|
122
122
|
internalName: string;
|
|
123
123
|
type: PropertyIndexedType.Boolean | PropertyIndexedType.Text | PropertyIndexedType.Number | PropertyIndexedType.Person | PropertyIndexedType.Taxonomy | PropertyIndexedType.EnterpriseKeywords | PropertyIndexedType.DateTime | PropertyIndexedType.Tags;
|
package/package.json
CHANGED