Skip to content

Commit d053a0e

Browse files
ponderingdemocritusponderingdemocritus
committed
feat: change format of return
1 parent 87e08cc commit d053a0e

17 files changed

+496
-774
lines changed

‎examples/clients/react/react-sdk/src/App.tsx

+8-53
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ interface Vec2 {
3939

4040
type Schema = {
4141
dojo_starter: {
42-
moves: Moves;
43-
directionsAvailable: DirectionsAvailable;
44-
position: Position;
42+
Moves: Moves;
43+
DirectionsAvailable: DirectionsAvailable;
44+
Position: Position;
4545
};
4646
};
4747

@@ -54,78 +54,33 @@ const db = await init<Schema>({
5454
});
5555

5656
function App() {
57-
// useEffect(() => {
58-
// let unsubscribe: Subscription | undefined;
59-
60-
// const subscribe = async () => {
61-
// try {
62-
// unsubscribe = await db.subscribeQuery(
63-
// {
64-
// moves: {},
65-
// },
66-
// (resp) => {
67-
// if (resp.error) {
68-
// console.error(
69-
// "Error querying moves:",
70-
// resp.error.message
71-
// );
72-
// return;
73-
// }
74-
// if (resp.data) {
75-
// console.log("Moves for player 123:", resp.data);
76-
// }
77-
// },
78-
// { logging: true }
79-
// );
80-
// } catch (error) {
81-
// console.error("Subscription error:", error);
82-
// }
83-
// };
84-
85-
// subscribe();
86-
87-
// return () => {
88-
// if (unsubscribe) {
89-
// unsubscribe.cancel();
90-
// console.log("Unsubscribed from moves query");
91-
// }
92-
// };
93-
// }, []);
94-
9557
useEffect(() => {
9658
const fetchEntities = async () => {
9759
try {
9860
const entities = await db.getEntities(
9961
{
10062
dojo_starter: {
101-
moves: {
63+
Moves: {
10264
$: {
103-
where: {
104-
remaining: {
105-
$eq: 97,
106-
},
107-
},
65+
where: { can_move: { $eq: true } },
10866
},
10967
},
11068
},
11169
},
11270
(resp) => {
11371
if (resp.error) {
11472
console.error(
115-
"Error querying completed important tasks:",
73+
"resp.error.message:",
11674
resp.error.message
11775
);
11876
return;
11977
}
12078
if (resp.data) {
121-
console.log(
122-
"Completed important tasks:",
123-
resp.data
124-
);
79+
console.log("resp.data:", resp.data.dojo_starter);
12580
}
12681
}
12782
);
128-
console.log("Queried entities:", entities.dojo_starter);
83+
console.log("Queried entities:", entities);
12984
} catch (error) {
13085
console.error("Error querying entities:", error);
13186
}

‎examples/dojo/dojo-starter/Scarb.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = 1
44
[[package]]
55
name = "dojo"
66
version = "1.0.0-alpha.4"
7-
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.11#fbff45b249e2b931f5007edf2d526beef7dc553f"
7+
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.12#b391948911356cbf8a91daa93314809c87411098"
88
dependencies = [
99
"dojo_plugin",
1010
]

‎examples/dojo/dojo-starter/Scarb.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ spawn = "./scripts/spawn.sh"
1212
move = "./scripts/move.sh"
1313

1414
[dependencies]
15-
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
15+
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.12" }
1616

1717
[[target.dojo]]

‎examples/dojo/dojo-starter/manifests/dev/deployment/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@
12351235
}
12361236
],
12371237
"address": "0x5d475a9221f6cbf1a016b12400a01b9a89935069aecd57e9876fcb2a7bb29da",
1238-
"transaction_hash": "0x178c2f4c963f5696df3e3609360f9c480bf7fc8f5aac68cafede930f04f9a6c",
1238+
"transaction_hash": "0x7a14c0bc82a029b58e91ae4616d7a44056149036e7d535e2f3b6a5945a59efe",
12391239
"block_number": 3,
12401240
"seed": "dojo_starter",
12411241
"metadata": {

‎examples/dojo/dojo-starter/manifests/dev/deployment/manifest.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
44
original_class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
55
abi = "manifests/dev/deployment/abis/dojo-world.json"
66
address = "0x5d475a9221f6cbf1a016b12400a01b9a89935069aecd57e9876fcb2a7bb29da"
7-
transaction_hash = "0x178c2f4c963f5696df3e3609360f9c480bf7fc8f5aac68cafede930f04f9a6c"
7+
transaction_hash = "0x7a14c0bc82a029b58e91ae4616d7a44056149036e7d535e2f3b6a5945a59efe"
88
block_number = 3
99
seed = "dojo_starter"
1010
manifest_name = "dojo-world"

‎packages/sdk/src/__tests__/client.test.ts

-70
This file was deleted.

‎packages/sdk/src/__tests__/convertQueryToClause.test.ts

+28-26
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,41 @@ describe("convertQueryToClause", () => {
4343
model: "world-player",
4444
member: "id",
4545
operator: "Eq",
46-
value: { Felt252: "1" },
46+
value: { Primitive: { Felt252: "1" } },
4747
},
4848
},
4949
{
5050
Member: {
5151
model: "world-player",
5252
member: "name",
5353
operator: "Eq",
54-
value: { Felt252: "Alice" },
54+
value: { Primitive: { Felt252: "Alice" } },
5555
},
5656
},
5757
],
5858
},
5959
});
6060
});
6161

62-
it("should convert a single model query without conditions", () => {
63-
const query: QueryType<MockSchemaType> = {
64-
world: {
65-
player: {},
66-
},
67-
};
68-
69-
const result = convertQueryToClause(query);
70-
71-
expect(result).toEqual({
72-
Keys: {
73-
keys: [],
74-
pattern_matching: "VariableLen",
75-
models: ["world-player"],
76-
},
77-
});
78-
});
62+
// it("should convert a single model query without conditions", () => {
63+
// const query: QueryType<MockSchemaType> = {
64+
// world: {
65+
// player: {
66+
// $: {},
67+
// },
68+
// },
69+
// };
70+
71+
// const result = convertQueryToClause(query);
72+
73+
// expect(result).toEqual({
74+
// Keys: {
75+
// keys: [undefined],
76+
// pattern_matching: "FixedLen",
77+
// models: ["world-player"],
78+
// },
79+
// });
80+
// });
7981

8082
it("should convert multiple model queries", () => {
8183
const query: QueryType<MockSchemaType> = {
@@ -98,15 +100,15 @@ describe("convertQueryToClause", () => {
98100
model: "world-player",
99101
member: "id",
100102
operator: "Eq",
101-
value: { Felt252: "1" },
103+
value: { Primitive: { Felt252: "1" } },
102104
},
103105
},
104106
{
105107
Member: {
106108
model: "world-game",
107109
member: "status",
108110
operator: "Eq",
109-
value: { Felt252: "active" },
111+
value: { Primitive: { Felt252: "active" } },
110112
},
111113
},
112114
],
@@ -133,15 +135,15 @@ describe("convertQueryToClause", () => {
133135
model: "world-player",
134136
member: "score",
135137
operator: "Gt",
136-
value: { U32: 100 },
138+
value: { Primitive: { U32: 100 } },
137139
},
138140
},
139141
{
140142
Member: {
141143
model: "world-player",
142144
member: "score",
143145
operator: "Lt",
144-
value: { U32: 1000 },
146+
value: { Primitive: { U32: 1000 } },
145147
},
146148
},
147149
],
@@ -169,7 +171,7 @@ describe("convertQueryToClause", () => {
169171
model: "world-player",
170172
member: "score",
171173
operator: "Gt",
172-
value: { U32: 50 },
174+
value: { Primitive: { U32: 50 } },
173175
},
174176
},
175177
],
@@ -200,15 +202,15 @@ describe("convertQueryToClause", () => {
200202
model: "world-player",
201203
member: "score",
202204
operator: "Gt",
203-
value: { U32: 100 },
205+
value: { Primitive: { U32: 100 } },
204206
},
205207
},
206208
{
207209
Member: {
208210
model: "world-item",
209211
member: "durability",
210212
operator: "Lt",
211-
value: { U32: 50 },
213+
value: { Primitive: { U32: 50 } },
212214
},
213215
},
214216
],

‎packages/sdk/src/__tests__/convertQueryToEntityKeyClauses.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe("convertQueryToEntityKeyClauses", () => {
5757
const expected: torii.EntityKeysClause[] = [
5858
{
5959
Keys: {
60-
keys: [],
60+
keys: [undefined],
6161
pattern_matching: "VariableLen",
6262
models: ["world-player"],
6363
},
@@ -98,7 +98,7 @@ describe("convertQueryToEntityKeyClauses", () => {
9898
{ HashedKeys: ["hash1"] },
9999
{
100100
Keys: {
101-
keys: [],
101+
keys: [undefined],
102102
pattern_matching: "VariableLen",
103103
models: ["world-player"],
104104
},
@@ -147,7 +147,7 @@ describe("convertQueryToEntityKeyClauses", () => {
147147
const expected: torii.EntityKeysClause[] = [
148148
{
149149
Keys: {
150-
keys: [],
150+
keys: [undefined],
151151
pattern_matching: "VariableLen",
152152
models: ["world-player"],
153153
},
@@ -167,7 +167,7 @@ describe("convertQueryToEntityKeyClauses", () => {
167167
const expected: torii.EntityKeysClause[] = [
168168
{
169169
Keys: {
170-
keys: [],
170+
keys: [undefined],
171171
pattern_matching: "VariableLen",
172172
models: ["world-player"],
173173
},

0 commit comments

Comments
 (0)