Skip to content

chore(filter): Add a switch statement #1108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 2, 2023
Merged

chore(filter): Add a switch statement #1108

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
372b3bd
Add a switch statement
danieljbruce May 3, 2023
49b0e90
chore(filter): Add a switch statement
danieljbruce May 3, 2023
bd3d714
Merge branch '1096-filter-function-should-have-a-switch' of https://g…
danieljbruce May 3, 2023
86bf4be
code review suggestions
danieljbruce May 3, 2023
c177b0f
Merge branch 'main' into 1096-filter-function-should-have-a-switch
danieljbruce May 29, 2023
12bf5d7
Merge branch 'main' into 1096-filter-function-should-have-a-switch
danieljbruce May 31, 2023
0d2a8f3
Merge branch 'main' into 1096-filter-function-should-have-a-switch
danieljbruce May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions src/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,33 @@ class Query {
operatorOrValue?: Operator | AllowedFilterValueType<T>,
value?: AllowedFilterValueType<T>
): Query {
if (isFilter(propertyOrFilter)) {
this.entityFilters.push(propertyOrFilter);
return this;
} else {
if (arguments.length > 1) {
process.emitWarning(
'Providing Filter objects like Composite Filter or Property Filter is recommended when using .filter'
);
let operator = operatorOrValue as Operator;
if (arguments.length === 2) {
value = operatorOrValue as AllowedFilterValueType<T>;
operator = '=';
}
switch (arguments.length) {
case 1: {
if (isFilter(propertyOrFilter)) {
this.entityFilters.push(propertyOrFilter);
}
break;
}
case 2: {
this.filters.push({
name: (propertyOrFilter as String).trim(),
op: '=',
val: operatorOrValue as AllowedFilterValueType<T>,
});
break;
}
case 3: {
this.filters.push({
name: (propertyOrFilter as String).trim(),
op: (operatorOrValue as Operator).trim() as Operator,
val: value,
});
}

this.filters.push({
name: (propertyOrFilter as String).trim(),
op: operator.trim() as Operator,
val: value,
});
}
return this;
}
Expand Down