Skip to content

feat: add support for more operators than contains #126

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: add support for more operators than contains #126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e4a821
feat: add support for more operators than contains
roggervalf Mar 9, 2025
ee2a551
feat: support or operators
roggervalf Mar 17, 2025
25e4ca7
chore: apply lint
roggervalf Mar 17, 2025
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
78 changes: 75 additions & 3 deletions src/utils/convert-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@ import { Op } from 'sequelize';

export const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-[5|4|3|2|1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;

const OPERATOR_SEPARATOR = '~';

const MATCHING_PATTERNS = {
EQ: 'equals',
NE: 'notEquals',
CO: 'contains',
EW: 'endsWith',
SW: 'startsWith',
};

const OPERATORS = {
AND: 'and',
OR: 'or',
};

export const convertFilter = (filter) => {
if (!filter) {
return {};
Expand All @@ -29,14 +44,71 @@ export const convertFilter = (filter) => {
},
};
}

let operatorExpression;
if (typeof value === 'object') {
if (value[MATCHING_PATTERNS.SW]) {
operatorExpression = {
[(Op.like as unknown) as string]: `${escape(value[MATCHING_PATTERNS.SW])}%`,
};
} else if (value[MATCHING_PATTERNS.EW]) {
operatorExpression = {
[(Op.like as unknown) as string]: `%${escape(value[MATCHING_PATTERNS.EW])}`,
};
} else if (value[MATCHING_PATTERNS.EQ]) {
operatorExpression = {
[Op.eq]: `${escape(value[MATCHING_PATTERNS.EQ])}`,
};
} else if (value[MATCHING_PATTERNS.NE]) {
operatorExpression = {
[Op.ne]: `${escape(value[MATCHING_PATTERNS.NE])}`,
};
} else {
const orPrefix = `${OPERATORS.OR}${OPERATOR_SEPARATOR}`;
if (value[`${orPrefix}${MATCHING_PATTERNS.SW}`]) {
operatorExpression = {
[(Op.like as unknown) as string]: `${escape(value[`${orPrefix}${MATCHING_PATTERNS.SW}`])}%`,
};
} else if (value[`${orPrefix}${MATCHING_PATTERNS.EW}`]) {
operatorExpression = {
[(Op.like as unknown) as string]: `%${escape(value[`${orPrefix}${MATCHING_PATTERNS.EW}`])}`,
};
} else if (value[`${orPrefix}${MATCHING_PATTERNS.EQ}`]) {
operatorExpression = {
[Op.eq]: `${escape(value[`${orPrefix}${MATCHING_PATTERNS.EQ}`])}`,
};
} else if (value[`${orPrefix}${MATCHING_PATTERNS.NE}`]) {
operatorExpression = {
[Op.ne]: `${escape(value[`${orPrefix}${MATCHING_PATTERNS.NE}`])}`,
};
} else if (value[OPERATORS.OR]) {
operatorExpression = {
[(Op.like as unknown) as string]: `%${escape(value[OPERATORS.OR])}%`,
};
}

return {
...memo,
[Op.or]: [
...(memo[Op.or] || []),
{
[property.name()]: operatorExpression,
},
],
};
}
} else {
operatorExpression = {
[(Op.like as unknown) as string]: `%${escape(value)}%`,
};
}

return {
...memo,
[Op.and]: [
...(memo[Op.and] || []),
{
[property.name()]: {
[(Op.like as unknown) as string]: `%${escape(value)}%`,
},
[property.name()]: operatorExpression,
},
],
};
Expand Down