hot fix component gen

dojoengine · Dec 14, 2023 · 4867de5 · 4867de5
1 parent 0a17308
commit 4867de5
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 109 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/examples/react-app/package.json b/examples/react-app/package.json
@@ -9,7 +9,7 @@
         "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
         "preview": "vite preview",
         "codegen": "graphql-codegen",
-        "create-components": "npx @dojoengine/core ../dojo-starter/target/dev/manifest.json src/dojo/contractComponents.ts http://localhost:5050 0x534692277764b04cfc469858891b825c799d1da550d2509fdd5be2f32abdaa0"
+        "create-components": "npx @dojoengine/core ../dojo-starter/target/dev/manifest.json src/dojo/contractComponents.ts http://localhost:5050 0x33ac2f528bb97cc7b79148fd1756dc368be0e95d391d8c6d6473ecb60b4560e"
     },
     "dependencies": {
         "@dojoengine/core": "link:dojo-packages/packages/core",

diff --git a/examples/react-app/src/dojo/contractComponents.ts b/examples/react-app/src/dojo/contractComponents.ts
@@ -3,39 +3,32 @@
 import { defineComponent, Type as RecsType, World } from "@dojoengine/recs";
 
 export function defineContractComponents(world: World) {
-    return {
-        Moves: (() => {
-            return defineComponent(
-                world,
-                {
-                    player: RecsType.BigInt,
-                    remaining: RecsType.Number,
-                    last_direction: RecsType.Number,
-                },
-                {
-                    metadata: {
-                        name: "Moves",
-                        types: ["contractaddress", "u8", "enum"],
-                        customTypes: ["Direction"],
-                    },
-                }
-            );
-        })(),
-        Position: (() => {
-            return defineComponent(
-                world,
-                {
-                    player: RecsType.BigInt,
-                    vec: { x: RecsType.Number, y: RecsType.Number },
-                },
-                {
-                    metadata: {
-                        name: "Position",
-                        types: ["contractaddress", "u32", "u32"],
-                        customTypes: ["Vec2"],
-                    },
-                }
-            );
-        })(),
-    };
+  return {
+	  Moves: (() => {
+	    return defineComponent(
+	      world,
+	      { player: RecsType.BigInt, remaining: RecsType.Number, last_direction: RecsType.Number },
+	      {
+	        metadata: {
+	          name: "Moves",
+	          types: ["contractaddress","u8","enum"],
+	          customTypes: ["Direction"],
+	        },
+	      }
+	    );
+	  })(),
+	  Position: (() => {
+	    return defineComponent(
+	      world,
+	      { player: RecsType.BigInt, vec: { x: RecsType.Number, y: RecsType.Number } },
+	      {
+	        metadata: {
+	          name: "Position",
+	          types: ["contractaddress","u32","u32"],
+	          customTypes: ["Vec2"],
+	        },
+	      }
+	    );
+	  })(),
+  };
 }
diff --git a/packages/core/bin/generateComponents.cjs b/packages/core/bin/generateComponents.cjs
@@ -51,7 +51,9 @@ fileContent += `export function defineContractComponents(world: World) {\n  retu
 manifest.models.forEach((model) => {
     const types = [];
     const customTypes = [];
-    const modelName = model.name;
+
+    let result = model.name.split('::').pop();
+    let modelName = result.charAt(0).toUpperCase() + result.slice(1);
 
     try {
         const output = execSync(

diff --git a/packages/create-dojo/bin/index.js b/packages/create-dojo/bin/index.js