Skip to content

lowercase filter operators #221

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 1 commit into from
Jun 16, 2025
Merged

lowercase filter operators #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions packages/hypergraph/src/entity/findMany.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ export function findMany<const S extends AnyNoContext>(

const evaluateFilter = <T>(fieldFilter: EntityFieldFilter<T>, fieldValue: T): boolean => {
// Handle NOT operator
if ('NOT' in fieldFilter && fieldFilter.NOT) {
return !evaluateFilter(fieldFilter.NOT, fieldValue);
if ('not' in fieldFilter && fieldFilter.not) {
return !evaluateFilter(fieldFilter.not, fieldValue);
}

// Handle OR operator
if ('OR' in fieldFilter) {
const orFilters = fieldFilter.OR;
if ('or' in fieldFilter) {
const orFilters = fieldFilter.or;
if (Array.isArray(orFilters)) {
return orFilters.some((orFilter) => evaluateFilter(orFilter as EntityFieldFilter<T>, fieldValue));
}
Expand Down Expand Up @@ -337,13 +337,13 @@ export function findMany<const S extends AnyNoContext>(

const evaluateEntityFilter = (entityFilter: EntityFilter<Schema.Schema.Type<S>>, entity: Entity<S>): boolean => {
// handle top-level NOT operator
if ('NOT' in entityFilter && entityFilter.NOT) {
return !evaluateCrossFieldFilter(entityFilter.NOT, entity);
if ('not' in entityFilter && entityFilter.not) {
return !evaluateCrossFieldFilter(entityFilter.not, entity);
}

// handle top-level OR operator
if ('OR' in entityFilter && Array.isArray(entityFilter.OR)) {
return entityFilter.OR.some((orFilter) => evaluateCrossFieldFilter(orFilter, entity));
if ('or' in entityFilter && Array.isArray(entityFilter.or)) {
return entityFilter.or.some((orFilter) => evaluateCrossFieldFilter(orFilter, entity));
}

// evaluate regular field filters
Expand Down
16 changes: 8 additions & 8 deletions packages/hypergraph/src/entity/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ export type EntityNumberFilter = {
is?: number;
greaterThan?: number;
lessThan?: number;
NOT?: EntityNumberFilter;
OR?: EntityNumberFilter[];
not?: EntityNumberFilter;
or?: EntityNumberFilter[];
};

export type EntityTextFilter = {
Expand All @@ -65,21 +65,21 @@ export type EntityTextFilter = {
endsWith?: string;
contains?: string;
equals?: string;
NOT?: EntityTextFilter;
OR?: EntityTextFilter[];
not?: EntityTextFilter;
or?: EntityTextFilter[];
};

export type CrossFieldFilter<T> = {
[K in keyof T]?: EntityFieldFilter<T[K]>;
} & {
OR?: Array<CrossFieldFilter<T>>;
NOT?: CrossFieldFilter<T>;
or?: Array<CrossFieldFilter<T>>;
not?: CrossFieldFilter<T>;
};

export type EntityFieldFilter<T> = {
is?: T;
NOT?: EntityFieldFilter<T>;
OR?: Array<EntityFieldFilter<T>>;
not?: EntityFieldFilter<T>;
or?: Array<EntityFieldFilter<T>>;
} & (T extends boolean
? {
is?: boolean;
Expand Down
28 changes: 14 additions & 14 deletions packages/hypergraph/test/entity/findMany.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
name: { NOT: { is: 'John' } },
name: { not: { is: 'John' } },
},
undefined,
);
Expand All @@ -213,7 +213,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
age: { NOT: { is: 30 } },
age: { not: { is: 30 } },
},
undefined,
);
Expand All @@ -234,7 +234,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
name: { OR: [{ is: 'John' }, { is: 'Jane' }] },
name: { or: [{ is: 'John' }, { is: 'Jane' }] },
},
undefined,
);
Expand All @@ -253,7 +253,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
age: { OR: [{ is: 25 }, { is: 40 }] },
age: { or: [{ is: 25 }, { is: 40 }] },
},
undefined,
);
Expand All @@ -274,7 +274,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
name: { NOT: { OR: [{ is: 'John' }, { is: 'Jane' }] } },
name: { not: { or: [{ is: 'John' }, { is: 'Jane' }] } },
},
undefined,
);
Expand All @@ -293,7 +293,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
name: { NOT: { OR: [{ is: 'John' }, { is: 'Jane' }] } },
name: { not: { or: [{ is: 'John' }, { is: 'Jane' }] } },
},
undefined,
);
Expand All @@ -314,7 +314,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
OR: [{ name: { contains: 'o' } }, { age: { greaterThan: 35 } }],
or: [{ name: { contains: 'o' } }, { age: { greaterThan: 35 } }],
},
undefined,
);
Expand All @@ -333,7 +333,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
NOT: {
not: {
name: { startsWith: 'J' },
age: { lessThan: 30 },
},
Expand All @@ -356,7 +356,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
OR: [
or: [
{
name: { startsWith: 'J' },
age: { lessThan: 30 },
Expand Down Expand Up @@ -385,8 +385,8 @@ describe('findMany with filters', () => {
handle,
Person,
{
name: { NOT: { startsWith: 'J' } },
age: { NOT: { greaterThan: 35 } },
name: { not: { startsWith: 'J' } },
age: { not: { greaterThan: 35 } },
},
undefined,
);
Expand All @@ -407,7 +407,7 @@ describe('findMany with filters', () => {
handle,
Product,
{
OR: [
or: [
{
category: { is: 'Electronics' },
price: { greaterThan: 800 },
Expand Down Expand Up @@ -436,7 +436,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
OR: [{ name: { startsWith: 'J' } }, { name: { contains: 'i' } }],
or: [{ name: { startsWith: 'J' } }, { name: { contains: 'i' } }],
isActive: { is: true },
},
undefined,
Expand All @@ -457,7 +457,7 @@ describe('findMany with filters', () => {
handle,
Person,
{
NOT: { name: { startsWith: 'J' } },
not: { name: { startsWith: 'J' } },
age: { greaterThan: 30 },
},
undefined,
Expand Down
Loading