Skip to content

Commit 4c8cac6

Browse files
MartianGreedMartianGreed
authored
Merge pull request #340 from dojoengine/fix/release-build
fix: release build issue with sdk + querybuilder type
2 parents fca2e4a + 25d3363 commit 4c8cac6

File tree

11 files changed

+127
-116
lines changed

11 files changed

+127
-116
lines changed

‎examples/example-vanillajs-phaser-recs/src/dojo/setup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export async function setup({ ...config }: Config) {
5353
sync = await getSyncEntities(
5454
toriiClient,
5555
contractModels as any,
56-
[],
57-
1000
56+
undefined,
57+
[]
5858
);
5959
} catch (e) {
6060
console.error("Failed to fetch sync:", e);

‎examples/example-vite-react-app-recs/src/dojo/setup.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,16 @@ export async function setup({ ...config }: DojoConfig) {
8080
clientComponents,
8181
contractComponents,
8282
systemCalls: createSystemCalls({ client }, clientComponents, world),
83-
publish: (typedData: string, signature: ArraySignatureType) => {
84-
toriiClient.publishMessage(typedData, signature);
83+
publish: (
84+
typedData: string,
85+
signature: ArraySignatureType,
86+
isSessionSignature = false
87+
) => {
88+
toriiClient.publishMessage(
89+
typedData,
90+
signature,
91+
isSessionSignature
92+
);
8593
},
8694
config,
8795
dojoProvider,

‎examples/example-vite-react-phaser-recs/src/dojo/generated/setup.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,8 @@ import { createSystemCalls } from "../createSystemCalls";
55
import { defineContractComponents } from "./contractComponents";
66
import { world } from "./world";
77
import { setupWorld } from "./generated";
8-
import {
9-
DojoConfig,
10-
DojoProvider,
11-
createModelTypedData,
12-
} from "@dojoengine/core";
13-
import {
14-
ArraySignatureType,
15-
TypedData,
16-
WeierstrassSignatureType,
17-
} from "starknet";
8+
import { DojoConfig, DojoProvider } from "@dojoengine/core";
9+
import { ArraySignatureType } from "starknet";
1810

1911
export type SetupResult = Awaited<ReturnType<typeof setup>>;
2012

@@ -37,6 +29,7 @@ export async function setup({ ...config }: DojoConfig) {
3729
const sync = await getSyncEntities(
3830
toriiClient,
3931
contractComponents as any,
32+
undefined,
4033
[]
4134
);
4235

@@ -53,8 +46,16 @@ export async function setup({ ...config }: DojoConfig) {
5346
contractComponents,
5447
clientComponents
5548
),
56-
publish: (typedData: string, signature: ArraySignatureType) => {
57-
toriiClient.publishMessage(typedData, signature);
49+
publish: (
50+
typedData: string,
51+
signature: ArraySignatureType,
52+
isSessionSignature = false
53+
) => {
54+
toriiClient.publishMessage(
55+
typedData,
56+
signature,
57+
isSessionSignature
58+
);
5859
},
5960
config,
6061
sync,

‎examples/example-vite-react-pwa-recs/src/dojo/generated/setup.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
import {
2-
createModelTypedData,
3-
DojoConfig,
4-
DojoProvider,
5-
} from "@dojoengine/core";
1+
import { DojoConfig, DojoProvider } from "@dojoengine/core";
62
import { BurnerManager } from "@dojoengine/create-burner";
73
import { getSyncEntities } from "@dojoengine/state";
84
import * as torii from "@dojoengine/torii-client";
9-
import {
10-
Account,
11-
ArraySignatureType,
12-
TypedData,
13-
WeierstrassSignatureType,
14-
} from "starknet";
5+
import { Account, ArraySignatureType } from "starknet";
156

167
import { createClientComponents } from "../createClientComponents";
178
import { createSystemCalls } from "../createSystemCalls";
@@ -40,6 +31,7 @@ export async function setup({ ...config }: DojoConfig) {
4031
const sync = await getSyncEntities(
4132
toriiClient,
4233
contractComponents as any,
34+
undefined,
4335
[]
4436
);
4537

@@ -81,8 +73,16 @@ export async function setup({ ...config }: DojoConfig) {
8173
contractComponents,
8274
clientComponents
8375
),
84-
publish: (typedData: string, signature: ArraySignatureType) => {
85-
toriiClient.publishMessage(typedData, signature);
76+
publish: (
77+
typedData: string,
78+
signature: ArraySignatureType,
79+
isSessionSignature = false
80+
) => {
81+
toriiClient.publishMessage(
82+
typedData,
83+
signature,
84+
isSessionSignature
85+
);
8686
},
8787
config,
8888
dojoProvider,

‎examples/example-vite-react-sdk/src/App.tsx

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect, useMemo } from "react";
2-
import { SDK, createDojoStore } from "@dojoengine/sdk";
2+
import { QueryBuilder, SDK, createDojoStore } from "@dojoengine/sdk";
33
import { getEntityIdFromKeys } from "@dojoengine/utils";
44
import { addAddressPadding } from "starknet";
55

@@ -38,34 +38,25 @@ function App({ sdk }: { sdk: SDK<Schema> }) {
3838
let unsubscribe: (() => void) | undefined;
3939

4040
const subscribe = async () => {
41-
const subscription = await sdk.subscribeEntityQuery(
42-
{
43-
dojo_starter: {
44-
Moves: {
45-
$: {
46-
where: {
47-
player: {
48-
$is: addAddressPadding(
49-
account.account.address
50-
),
51-
},
52-
},
53-
},
54-
},
55-
Position: {
56-
$: {
57-
where: {
58-
player: {
59-
$is: addAddressPadding(
60-
account.account.address
61-
),
62-
},
63-
},
64-
},
65-
},
66-
},
67-
},
68-
(response) => {
41+
const subscription = await sdk.subscribeEntityQuery({
42+
query: new QueryBuilder<Schema>()
43+
.namespace("dojo_starter", (n) =>
44+
n
45+
.entity("Moves", (e) =>
46+
e.eq(
47+
"player",
48+
addAddressPadding(account.account.address)
49+
)
50+
)
51+
.entity("Position", (e) =>
52+
e.is(
53+
"player",
54+
addAddressPadding(account.account.address)
55+
)
56+
)
57+
)
58+
.build(),
59+
callback: (response) => {
6960
if (response.error) {
7061
console.error(
7162
"Error setting up entity sync:",
@@ -79,8 +70,7 @@ function App({ sdk }: { sdk: SDK<Schema> }) {
7970
state.updateEntity(response.data[0]);
8071
}
8172
},
82-
{ logging: true }
83-
);
73+
});
8474

8575
unsubscribe = () => subscription.cancel();
8676
};
@@ -97,23 +87,18 @@ function App({ sdk }: { sdk: SDK<Schema> }) {
9787
useEffect(() => {
9888
const fetchEntities = async () => {
9989
try {
100-
await sdk.getEntities(
101-
{
102-
dojo_starter: {
103-
Moves: {
104-
$: {
105-
where: {
106-
player: {
107-
$eq: addAddressPadding(
108-
account.account.address
109-
),
110-
},
111-
},
112-
},
113-
},
114-
},
115-
},
116-
(resp) => {
90+
await sdk.getEntities({
91+
query: new QueryBuilder<Schema>()
92+
.namespace("dojo_starter", (n) =>
93+
n.entity("Moves", (e) =>
94+
e.eq(
95+
"player",
96+
addAddressPadding(account.account.address)
97+
)
98+
)
99+
)
100+
.build(),
101+
callback: (resp) => {
117102
if (resp.error) {
118103
console.error(
119104
"resp.error.message:",
@@ -124,8 +109,8 @@ function App({ sdk }: { sdk: SDK<Schema> }) {
124109
if (resp.data) {
125110
state.setEntities(resp.data);
126111
}
127-
}
128-
);
112+
},
113+
});
129114
} catch (error) {
130115
console.error("Error querying entities:", error);
131116
}

‎examples/example-vite-react-sdk/src/contracts.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Import the necessary types from the recs SDK
33
// generate again with `sozo build --typescript`
44
import { DojoProvider } from "@dojoengine/core";
5-
import { Account, byteArray } from "starknet";
5+
import { Account } from "starknet";
66

77
export type IClient = Awaited<ReturnType<typeof client>>;
88

‎examples/example-vite-react-sdk/tsconfig.app.tsbuildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"root":["./src/app.tsx","./src/bindings.ts","./src/main.tsx","./src/vite-env.d.ts"],"version":"5.6.2"}
1+
{"root":["./src/app.tsx","./src/dojocontext.tsx","./src/bindings.ts","./src/contracts.gen.ts","./src/main.tsx","./src/usedojo.tsx","./src/usemodel.tsx","./src/usesystemcalls.ts","./src/vite-env.d.ts"],"version":"5.6.3"}

‎examples/example-vite-react-sdk/tsconfig.node.tsbuildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"root":["./vite.config.ts"],"version":"5.6.2"}
1+
{"root":["./vite.config.ts"],"version":"5.6.3"}

‎examples/example-vite-react-threejs-recs/src/dojo/generated/setup.ts

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
import {
2-
createModelTypedData,
3-
DojoConfig,
4-
DojoProvider,
5-
} from "@dojoengine/core";
1+
import { DojoConfig, DojoProvider } from "@dojoengine/core";
62
import { BurnerManager } from "@dojoengine/create-burner";
73
import { getSyncEntities } from "@dojoengine/state";
84
import * as torii from "@dojoengine/torii-client";
9-
import {
10-
Account,
11-
ArraySignatureType,
12-
RpcProvider,
13-
Signature,
14-
TypedData,
15-
WeierstrassSignatureType,
16-
} from "starknet";
5+
import { Account, ArraySignatureType } from "starknet";
176

187
import { createClientComponents } from "../createClientComponents";
198
import { createSystemCalls } from "../createSystemCalls";
@@ -43,6 +32,7 @@ export async function setup({ ...config }: DojoConfig) {
4332
const sync = await getSyncEntities(
4433
toriiClient,
4534
contractComponents as any,
35+
undefined,
4636
[]
4737
);
4838

@@ -83,8 +73,16 @@ export async function setup({ ...config }: DojoConfig) {
8373
contractComponents,
8474
clientComponents
8575
),
86-
publish: (typedData: string, signature: ArraySignatureType) => {
87-
toriiClient.publishMessage(typedData, signature);
76+
publish: (
77+
typedData: string,
78+
signature: ArraySignatureType,
79+
isSessionSignature: boolean = false
80+
) => {
81+
toriiClient.publishMessage(
82+
typedData,
83+
signature,
84+
isSessionSignature
85+
);
8886
},
8987
config,
9088
world,

‎examples/example-vite-svelte-recs/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
node_modules
1+
node_modules
2+
dist/

0 commit comments

Comments
 (0)