Skip to content

fix: utils - change way to compute selector hash #250

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 2 commits into from
Aug 7, 2024
Merged

fix: utils - change way to compute selector hash #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aab4f27
fix: utils - change way to compute selector hash
MartianGreed Aug 6, 2024
ead2a2d
fix: remove logging
MartianGreed Aug 7, 2024
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
44 changes: 26 additions & 18 deletions packages/state/src/recs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,26 +184,34 @@ export const setEntities = async <S extends Schema>(
entities: any,
components: Component<S, Metadata, undefined>[]
) => {
console.log(entities, components);
for (let key in entities) {
if (entities.hasOwnProperty(key)) {
for (let componentName in entities[key]) {
if (entities[key].hasOwnProperty(componentName)) {
let recsComponent = Object.values(components).find(
(component) =>
component.metadata?.name === componentName
);
if (!Object.hasOwn(entities, key)) {
continue;
}

for (let componentName in entities[key]) {
if (!Object.hasOwn(entities[key], componentName)) {
continue;
}
let recsComponent = Object.values(components).find(
(component) => component.metadata?.name === componentName
);

if (recsComponent) {
setComponent(
recsComponent,
key as Entity,
convertValues(
recsComponent.schema,
entities[key][componentName]
) as ComponentValue
);
}
if (recsComponent) {
try {
setComponent(
recsComponent,
key as Entity,
convertValues(
recsComponent.schema,
entities[key][componentName]
) as ComponentValue
);
} catch (error) {
console.warn(
`Failed to set component ${recsComponent.metadata?.name} on ${key}`,
error
);
}
}
}
Expand Down
136 changes: 71 additions & 65 deletions packages/state/src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,83 @@
import { Type as RecsType, Schema } from "@dojoengine/recs";
import { Type as RecsType, Schema, ComponentValue } from "@dojoengine/recs";

export function convertValues(schema: Schema, values: any) {
return Object.keys(schema).reduce<any>((acc, key) => {
if (!acc) {
acc = {}; // Ensure acc is initialized
}
const schemaType = schema[key];
const value = values[key];
export function convertValues(schema: Schema, values: any): ComponentValue {
return Object.keys(schema).reduce<any>(
(acc: ComponentValue, key: string) => {
if (!acc) {
acc = {}; // Ensure acc is initialized
}
const schemaType = schema[key];
const value = values[key];

if (value === null || value === undefined) {
acc[key] = value;
return acc;
}
if (value === null || value === undefined) {
acc[key] = value;
return acc;
}

if (value.type === "enum") {
acc[key] = value.value.option;
return acc;
}
if (value.type === "enum") {
acc[key] = value.value.option;
return acc;
}

switch (schemaType) {
case RecsType.StringArray:
if (value.type === "array" && value.value[0].type === "enum") {
acc[key] = value.value.map(
(item: any) => item.value.option
);
} else {
acc[key] = value.value.map((a: any) => {
try {
return BigInt(a.value);
} catch (error) {
console.warn(
`Failed to convert ${a.value} to BigInt. Using string value instead.`
);
return a.value;
}
});
}
break;
switch (schemaType) {
case RecsType.StringArray:
if (
value.type === "array" &&
value.value[0].type === "enum"
) {
acc[key] = value.value.map(
(item: any) => item.value.option
);
} else {
acc[key] = value.value.map((a: any) => {
try {
return BigInt(a.value);
} catch (error) {
console.warn(
`Failed to convert ${a.value} to BigInt. Using string value instead.`
);
return a.value;
}
});
}
break;

case RecsType.String:
acc[key] = value.value;
break;
case RecsType.String:
acc[key] = value.value;
break;

case RecsType.BigInt:
try {
acc[key] = BigInt(value.value);
} catch (error) {
console.warn(
`Failed to convert ${value.value} to BigInt. Using string value instead.`
);
case RecsType.BigInt:
try {
acc[key] = BigInt(value.value);
} catch (error) {
console.warn(
`Failed to convert ${value.value} to BigInt. Using string value instead.`
);

acc[key] = BigInt(`0x${value.value}`);
}
break;
acc[key] = BigInt(`0x${value.value}`);
}
break;

case RecsType.Boolean:
acc[key] = value.value;
break;
case RecsType.Boolean:
acc[key] = value.value;
break;

case RecsType.Number:
acc[key] = Number(value.value);
break;
case RecsType.Number:
acc[key] = Number(value.value);
break;

default:
if (
typeof schemaType === "object" &&
typeof value === "object"
) {
acc[key] = convertValues(schemaType, value.value);
}
break;
}
default:
if (
typeof schemaType === "object" &&
typeof value === "object"
) {
acc[key] = convertValues(schemaType, value.value);
}
break;
}

return acc;
}, {});
return acc;
},
{}
);
}
38 changes: 38 additions & 0 deletions packages/utils/coverage/.tmp/coverage-0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"result": [
{
"scriptId": "576",
"url": "file:///Users/valentindosimont/www/dojo.js/packages/utils/src/_test_/utils/index.test.ts",
"functions": [
{
"functionName": "",
"ranges": [
{ "startOffset": 0, "endOffset": 1213, "count": 1 }
],
"isBlockCoverage": true
},
{
"functionName": "",
"ranges": [
{ "startOffset": 13, "endOffset": 1213, "count": 1 }
],
"isBlockCoverage": true
},
{
"functionName": "",
"ranges": [
{ "startOffset": 339, "endOffset": 467, "count": 1 }
],
"isBlockCoverage": true
},
{
"functionName": "",
"ranges": [
{ "startOffset": 400, "endOffset": 463, "count": 1 }
],
"isBlockCoverage": true
}
]
}
]
}
7 changes: 5 additions & 2 deletions packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"type": "module",
"scripts": {
"build": "tsup --dts-resolve",
"test": "jest"
"test": "vitest run",
"coverage": "vitest run --coverage"
},
"exports": {
".": {
Expand All @@ -19,7 +20,9 @@
"devDependencies": {
"@types/elliptic": "^6.4.14",
"tsup": "^8.0.1",
"typescript": "^5.0.3"
"typescript": "^5.0.3",
"@vitest/coverage-v8": "^1.3.0",
"vitest": "^1.1.0"
},
"peerDependencies": {
"starknet": "6.11.0"
Expand Down
106 changes: 106 additions & 0 deletions packages/utils/src/_test_/utils/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import { describe, it, expect } from "vitest";
import {
computeByteArrayHash,
getSelectorFromTag,
getComponentNameFromEvent,
splitEventTag,
} from "../../utils/index";
import { byteArray } from "starknet";

describe("utils", () => {
it("should getComponentFromEvent", () => {
const f = (actions: string[], event: string[], action: string) => {
expect(getComponentNameFromEvent(actions, event)).toBe(action);
};

// Working tests
f(
[
"dojo_starter-Moves",
"dojo_starter-Moved",
"dojo_starter-Position",
],
[
"0x2a29373f1af8348bd366a990eb3a342ef2cbe5e85160539eaca3441a673f468",
"0x1",
"0x434962bc189d79bb549fa55f492780831b0852acf26c6d345f47f520d518589",
"0x3",
"0x64",
"0x0",
"0x1",
],
"dojo_starter-Moves"
);
f(
[
"dojo_starter-Moves",
"dojo_starter-Moved",
"dojo_starter-Position",
],
[
"0x2ac8b4c190f7031b9fc44312e6b047a1dce0b3f2957c33a935ca7846a46dd5b",
"0x1",
"0x434962bc189d79bb549fa55f492780831b0852acf26c6d345f47f520d518589",
"0x3",
"0x64",
"0x0",
"0x1",
],
"dojo_starter-Position"
);
});

it("should throw an exception when the action is not found", () => {
const f = (actions: string[], event: string[]) => {
expect(() =>
getComponentNameFromEvent(actions, event)
).toThrowError();
};
// Should throw an exception
f(
["dojo_starter-Invalid"],
[
"0x2ac8b4c190f7031b9fc44312e6b047a1dce0b3f2957c33a935ca7846a46dd5b",
"0x1",
"0x434962bc189d79bb549fa55f492780831b0852acf26c6d345f47f520d518589",
"0x3",
"0x64",
"0x0",
"0x1",
]
);
});
it("should splitEventTag", () => {
const f = (tag: string, expected: string[]) => {
expect(splitEventTag(tag)).toEqual(expected);
};

f("dojo_starter-Moves", ["dojo_starter", "Moves"]);
f("dojo_starter-Moved", ["dojo_starter", "Moved"]);
f("dojo_starter-Position", ["dojo_starter", "Position"]);
});

it("should computeByteArrayHash", () => {
const t = computeByteArrayHash("test");
expect("0x" + t.toString(16)).toBe(
"0x2ca96bf6e71766195fa290b97c50f073b218d4e8c6948c899e3b07d754d6760"
);
});

it("should get the proper event name", () => {
const f = (namespace: string, event: string, expected: string) => {
expect(getSelectorFromTag(namespace, event)).toBe(expected);
};

f(
"dojo_starter",
"Moves",
"0x2a29373f1af8348bd366a990eb3a342ef2cbe5e85160539eaca3441a673f468"
);
f(
"dojo_starter",
"Position",
"0x2ac8b4c190f7031b9fc44312e6b047a1dce0b3f2957c33a935ca7846a46dd5b"
);
});
});
Loading
Loading