Skip to content

Commit 0aceb0b

Browse files
nikgrafnikgraf
committed
fix tests
1 parent fad78d6 commit 0aceb0b

File tree

7 files changed

+231
-179
lines changed

7 files changed

+231
-179
lines changed

‎packages/hypergraph-react/test/HypergraphSpaceContext.test.tsx‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Repo } from '@automerge/automerge-repo';
22
import { RepoContext } from '@automerge/automerge-repo-react-hooks';
3-
import { Entity, store, Type } from '@graphprotocol/hypergraph';
3+
import { type Entity, EntitySchema, Id, store, Type } from '@graphprotocol/hypergraph';
44
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
55
import '@testing-library/jest-dom/vitest';
66
import { act, cleanup, renderHook, waitFor } from '@testing-library/react';
@@ -18,19 +18,45 @@ afterEach(() => {
1818
});
1919

2020
describe('HypergraphSpaceContext', () => {
21-
class Person extends Entity.Class<Person>('Person')({
22-
name: Type.String,
23-
age: Type.Number,
24-
}) {}
25-
26-
class User extends Entity.Class<User>('User')({
27-
name: Type.String,
28-
email: Type.String,
29-
}) {}
30-
31-
class Event extends Entity.Class<Event>('Event')({
32-
name: Type.String,
33-
}) {}
21+
const Person = EntitySchema(
22+
{
23+
name: Type.String,
24+
age: Type.Number,
25+
},
26+
{
27+
types: [Id('bffa181e-a333-495b-949c-57f2831d7eca')],
28+
properties: {
29+
name: Id('a126ca53-0c8e-48d5-b888-82c734c38935'),
30+
age: Id('a427183d-3519-4c96-b80a-5a0c64daed41'),
31+
},
32+
},
33+
);
34+
35+
const User = EntitySchema(
36+
{
37+
name: Type.String,
38+
email: Type.String,
39+
},
40+
{
41+
types: [Id('bffa181e-a333-495b-949c-57f2831d7eca')],
42+
properties: {
43+
name: Id('a126ca53-0c8e-48d5-b888-82c734c38935'),
44+
email: Id('b667f951-4ede-40ef-83f8-fb5efee8c2ae'),
45+
},
46+
},
47+
);
48+
49+
const Event = EntitySchema(
50+
{
51+
name: Type.String,
52+
},
53+
{
54+
types: [Id('bffa181e-a333-495b-949c-57f2831d7eca')],
55+
properties: {
56+
name: Id('a126ca53-0c8e-48d5-b888-82c734c38935'),
57+
},
58+
},
59+
);
3460

3561
const spaceId = '1e5e39da-a00d-4fd8-b53b-98095337112f';
3662

@@ -120,9 +146,7 @@ describe('HypergraphSpaceContext', () => {
120146

121147
await waitFor(() => {
122148
expect(createdEntity).not.toBeNull();
123-
expect(createdEntity).toEqual(
124-
expect.objectContaining({ name: 'Test', age: 1, type: Person.name, __deleted: false }),
125-
);
149+
expect(createdEntity).toEqual(expect.objectContaining({ name: 'Test', age: 1, __deleted: false }));
126150
});
127151

128152
if (createdEntity == null) {
@@ -187,9 +211,7 @@ describe('HypergraphSpaceContext', () => {
187211

188212
await waitFor(() => {
189213
expect(createdEntity).not.toBeNull();
190-
expect(createdEntity).toEqual(
191-
expect.objectContaining({ name: 'Test', email: '[email protected]', type: User.name }),
192-
);
214+
expect(createdEntity?.name).toEqual('Test');
193215
});
194216

195217
const { result: queryEntitiesResult, rerender: rerenderQueryEntities } = renderHook(() => useQueryPrivate(User), {

‎packages/hypergraph-react/test/internal/translate-filter-to-graphql.test.ts‎

Lines changed: 47 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
import { Graph, Id } from '@graphprotocol/grc-20';
2-
import { Entity, type Mapping, Type } from '@graphprotocol/hypergraph';
2+
import { type Entity, EntitySchema, type Mapping, Type } from '@graphprotocol/hypergraph';
3+
import type * as Schema from 'effect/Schema';
34
import { describe, expect, it } from 'vitest';
45
import { translateFilterToGraphql } from '../../src/internal/translate-filter-to-graphql.js';
56

6-
export class Todo extends Entity.Class<Todo>('Todo')({
7-
name: Type.String,
8-
completed: Type.Boolean,
9-
priority: Type.Number,
10-
}) {}
7+
export const Todo = EntitySchema(
8+
{
9+
name: Type.String,
10+
completed: Type.Boolean,
11+
priority: Type.Number,
12+
},
13+
{
14+
types: [Id('a288444f-06a3-4037-9ace-66fe325864d0')],
15+
properties: {
16+
name: Id('a126ca53-0c8e-48d5-b888-82c734c38935'),
17+
completed: Id('d2d64cd3-a337-4784-9e30-25bea0349471'),
18+
priority: Id('ee920534-42ce-4113-a63b-8f3c889dd772'),
19+
},
20+
},
21+
);
1122

1223
const mapping: Mapping.Mapping = {
1324
Todo: {
@@ -20,13 +31,15 @@ const mapping: Mapping.Mapping = {
2031
},
2132
};
2233

34+
type TodoFilter = Entity.EntityFilter<Schema.Schema.Type<typeof Todo>>;
35+
2336
describe('translateFilterToGraphql string filters', () => {
2437
it('should translate string `is` filter correctly', () => {
25-
const filter: Entity.EntityFilter<Todo> = {
38+
const filter: TodoFilter = {
2639
name: { is: 'test' },
2740
};
2841

29-
const result = translateFilterToGraphql(filter, Todo, mapping);
42+
const result = translateFilterToGraphql(filter, Todo);
3043

3144
expect(result).toEqual({
3245
values: {
@@ -39,11 +52,11 @@ describe('translateFilterToGraphql string filters', () => {
3952
});
4053

4154
it('should translate string `contains` filter correctly', () => {
42-
const filter: Entity.EntityFilter<Todo> = {
55+
const filter: TodoFilter = {
4356
name: { contains: 'test' },
4457
};
4558

46-
const result = translateFilterToGraphql(filter, Todo, mapping);
59+
const result = translateFilterToGraphql(filter, Todo);
4760

4861
expect(result).toEqual({
4962
values: {
@@ -56,11 +69,11 @@ describe('translateFilterToGraphql string filters', () => {
5669
});
5770

5871
it('should translate string `startsWith` filter correctly', () => {
59-
const filter: Entity.EntityFilter<Todo> = {
72+
const filter: TodoFilter = {
6073
name: { startsWith: 'test' },
6174
};
6275

63-
const result = translateFilterToGraphql(filter, Todo, mapping);
76+
const result = translateFilterToGraphql(filter, Todo);
6477

6578
expect(result).toEqual({
6679
values: {
@@ -73,11 +86,11 @@ describe('translateFilterToGraphql string filters', () => {
7386
});
7487

7588
it('should translate string `endsWith` filter correctly', () => {
76-
const filter: Entity.EntityFilter<Todo> = {
89+
const filter: TodoFilter = {
7790
name: { endsWith: 'test' },
7891
};
7992

80-
const result = translateFilterToGraphql(filter, Todo, mapping);
93+
const result = translateFilterToGraphql(filter, Todo);
8194

8295
expect(result).toEqual({
8396
values: {
@@ -92,11 +105,11 @@ describe('translateFilterToGraphql string filters', () => {
92105

93106
describe('translateFilterToGraphql boolean filters', () => {
94107
it('should translate boolean `is` filter correctly', () => {
95-
const filter: Entity.EntityFilter<Todo> = {
108+
const filter: TodoFilter = {
96109
completed: { is: true },
97110
};
98111

99-
const result = translateFilterToGraphql(filter, Todo, mapping);
112+
const result = translateFilterToGraphql(filter, Todo);
100113

101114
expect(result).toEqual({
102115
values: {
@@ -111,11 +124,11 @@ describe('translateFilterToGraphql boolean filters', () => {
111124

112125
describe('translateFilterToGraphql number filters', () => {
113126
it('should translate number `is` filter correctly', () => {
114-
const filter: Entity.EntityFilter<Todo> = {
127+
const filter: TodoFilter = {
115128
priority: { is: 1 },
116129
};
117130

118-
const result = translateFilterToGraphql(filter, Todo, mapping);
131+
const result = translateFilterToGraphql(filter, Todo);
119132

120133
expect(result).toEqual({
121134
values: {
@@ -128,11 +141,11 @@ describe('translateFilterToGraphql number filters', () => {
128141
});
129142

130143
it('should translate number `greaterThan` filter correctly', () => {
131-
const filter: Entity.EntityFilter<Todo> = {
144+
const filter: TodoFilter = {
132145
priority: { greaterThan: 1 },
133146
};
134147

135-
const result = translateFilterToGraphql(filter, Todo, mapping);
148+
const result = translateFilterToGraphql(filter, Todo);
136149

137150
expect(result).toEqual({
138151
values: {
@@ -147,13 +160,13 @@ describe('translateFilterToGraphql number filters', () => {
147160

148161
describe('translateFilterToGraphql multiple filters', () => {
149162
it('should translate multiple filters correctly', () => {
150-
const filter: Entity.EntityFilter<Todo> = {
163+
const filter: TodoFilter = {
151164
name: { is: 'test' },
152165
completed: { is: true },
153166
priority: { greaterThan: 1 },
154167
};
155168

156-
const result = translateFilterToGraphql(filter, Todo, mapping);
169+
const result = translateFilterToGraphql(filter, Todo);
157170

158171
expect(result).toEqual({
159172
and: [
@@ -188,11 +201,11 @@ describe('translateFilterToGraphql multiple filters', () => {
188201

189202
describe('translateFilterToGraphql with OR operator', () => {
190203
it('should translate OR operator in nested filter array', () => {
191-
const filter: Entity.EntityFilter<Todo> = {
204+
const filter: TodoFilter = {
192205
or: [{ name: { is: 'test' } }, { name: { is: 'test2' } }],
193206
};
194207

195-
const result = translateFilterToGraphql(filter, Todo, mapping);
208+
const result = translateFilterToGraphql(filter, Todo);
196209

197210
expect(result).toEqual({
198211
or: [
@@ -207,11 +220,11 @@ describe('translateFilterToGraphql with OR operator', () => {
207220
});
208221

209222
it('should translate OR operator in nested filter array', () => {
210-
const filter: Entity.EntityFilter<Todo> = {
223+
const filter: TodoFilter = {
211224
or: [{ name: { is: 'test' } }, { completed: { is: true } }],
212225
};
213226

214-
const result = translateFilterToGraphql(filter, Todo, mapping);
227+
const result = translateFilterToGraphql(filter, Todo);
215228

216229
expect(result).toEqual({
217230
or: [
@@ -228,23 +241,23 @@ describe('translateFilterToGraphql with OR operator', () => {
228241

229242
describe('translateFilterToGraphql with NOT operator', () => {
230243
it('should translate NOT operator', () => {
231-
const filter: Entity.EntityFilter<Todo> = {
244+
const filter: TodoFilter = {
232245
not: { name: { is: 'test' } },
233246
};
234247

235-
const result = translateFilterToGraphql(filter, Todo, mapping);
248+
const result = translateFilterToGraphql(filter, Todo);
236249

237250
expect(result).toEqual({
238251
not: { values: { some: { propertyId: { is: 'a126ca53-0c8e-48d5-b888-82c734c38935' }, string: { is: 'test' } } } },
239252
});
240253
});
241254

242255
it('should translate NOT operator with multiple filters', () => {
243-
const filter: Entity.EntityFilter<Todo> = {
256+
const filter: TodoFilter = {
244257
not: { name: { is: 'test' }, completed: { is: true } },
245258
};
246259

247-
const result = translateFilterToGraphql(filter, Todo, mapping);
260+
const result = translateFilterToGraphql(filter, Todo);
248261

249262
expect(result).toEqual({
250263
not: {
@@ -259,11 +272,11 @@ describe('translateFilterToGraphql with NOT operator', () => {
259272

260273
describe('translateFilterToGraphql with complex nested filters', () => {
261274
it('should translate complex nested filters with or and not', () => {
262-
const filter: Entity.EntityFilter<Todo> = {
275+
const filter: TodoFilter = {
263276
or: [{ not: { name: { is: 'Jane Doe' } } }, { not: { name: { is: 'John Doe' } } }],
264277
};
265278

266-
const result = translateFilterToGraphql(filter, Todo, mapping);
279+
const result = translateFilterToGraphql(filter, Todo);
267280

268281
expect(result).toEqual({
269282
or: [
@@ -286,7 +299,7 @@ describe('translateFilterToGraphql with complex nested filters', () => {
286299
});
287300

288301
it('should translate complex nested filters with and, or and not', () => {
289-
const filter: Entity.EntityFilter<Todo> = {
302+
const filter: TodoFilter = {
290303
priority: {
291304
is: 42,
292305
},
@@ -296,7 +309,7 @@ describe('translateFilterToGraphql with complex nested filters', () => {
296309
},
297310
};
298311

299-
const result = translateFilterToGraphql(filter, Todo, mapping);
312+
const result = translateFilterToGraphql(filter, Todo);
300313

301314
expect(result).toEqual({
302315
and: [

0 commit comments

Comments
 (0)