@latticexyz/cli 2.0.0-main-e196ca27 → 2.0.0-main-3bfee32c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "2.0.0-main-e196ca27",
+  "version": "2.0.0-main-3bfee32c",
   "description": "Command line interface for mud",
   "repository": {
     "type": "git",
@@ -40,17 +40,17 @@
     "yargs": "^17.7.1",
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0",
-    "@latticexyz/abi-ts": "2.0.0-main-e196ca27",
-    "@latticexyz/common": "2.0.0-main-e196ca27",
-    "@latticexyz/config": "2.0.0-main-e196ca27",
-    "@latticexyz/gas-report": "2.0.0-main-e196ca27",
-    "@latticexyz/protocol-parser": "2.0.0-main-e196ca27",
-    "@latticexyz/schema-type": "2.0.0-main-e196ca27",
-    "@latticexyz/services": "2.0.0-main-e196ca27",
-    "@latticexyz/store": "2.0.0-main-e196ca27",
-    "@latticexyz/utils": "2.0.0-main-e196ca27",
-    "@latticexyz/world": "2.0.0-main-e196ca27",
-    "@latticexyz/world-modules": "2.0.0-main-e196ca27"
+    "@latticexyz/abi-ts": "2.0.0-main-3bfee32c",
+    "@latticexyz/common": "2.0.0-main-3bfee32c",
+    "@latticexyz/config": "2.0.0-main-3bfee32c",
+    "@latticexyz/gas-report": "2.0.0-main-3bfee32c",
+    "@latticexyz/protocol-parser": "2.0.0-main-3bfee32c",
+    "@latticexyz/schema-type": "2.0.0-main-3bfee32c",
+    "@latticexyz/services": "2.0.0-main-3bfee32c",
+    "@latticexyz/store": "2.0.0-main-3bfee32c",
+    "@latticexyz/utils": "2.0.0-main-3bfee32c",
+    "@latticexyz/world": "2.0.0-main-3bfee32c",
+    "@latticexyz/world-modules": "2.0.0-main-3bfee32c"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",

package/src/commands/dev-contracts.ts

@@ -9,8 +9,9 @@ import { WorldConfig } from "@latticexyz/world";
 import { homedir } from "os";
 import { rmSync } from "fs";
 import { deployOptions, runDeploy } from "../runDeploy";
-import { BehaviorSubject, debounceTime, exhaustMap } from "rxjs";
+import { BehaviorSubject, debounceTime, exhaustMap, filter } from "rxjs";
 import { Address } from "viem";
+import { isDefined } from "@latticexyz/common/utils";
 
 const devOptions = {
   rpc: deployOptions.rpc,
@@ -52,13 +53,15 @@ const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof
 
     // Watch for changes
     const lastChange$ = new BehaviorSubject<number>(Date.now());
-    chokidar.watch([configPath, srcDir, scriptDir]).on("all", async (_, updatePath) => {
+    chokidar.watch([configPath, srcDir, scriptDir], { ignoreInitial: true }).on("all", async (_, updatePath) => {
       if (updatePath.includes(configPath)) {
+        console.log(chalk.blue("Config changed, queuing deploy…"));
         lastChange$.next(Date.now());
       }
       if (updatePath.includes(srcDir) || updatePath.includes(scriptDir)) {
         // Ignore changes to codegen files to avoid an infinite loop
         if (!updatePath.includes(initialConfig.codegenDirectory)) {
+          console.log(chalk.blue("Contracts changed, queuing deploy…"));
           lastChange$.next(Date.now());
         }
       }
@@ -71,29 +74,36 @@ const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof
       debounceTime(200),
       exhaustMap(async (lastChange) => {
         if (worldAddress) {
-          console.log(chalk.blue("Change detected, rebuilding and running deploy..."));
+          console.log(chalk.blue("Rebuilding and upgrading world…"));
         }
-        // TODO: handle errors
-        const deploy = await runDeploy({
-          ...opts,
-          configPath,
-          rpc,
-          skipBuild: false,
-          printConfig: false,
-          profile: undefined,
-          saveDeployment: true,
-          worldAddress,
-          srcDir,
-        });
-        worldAddress = deploy.address;
-        // if there were changes while we were deploying, trigger it again
-        if (lastChange < lastChange$.value) {
-          lastChange$.next(lastChange$.value);
-        } else {
-          console.log(chalk.gray("Watching for file changes..."));
+
+        try {
+          const deploy = await runDeploy({
+            ...opts,
+            configPath,
+            rpc,
+            skipBuild: false,
+            printConfig: false,
+            profile: undefined,
+            saveDeployment: true,
+            worldAddress,
+            srcDir,
+          });
+          worldAddress = deploy.address;
+          // if there were changes while we were deploying, trigger it again
+          if (lastChange < lastChange$.value) {
+            lastChange$.next(lastChange$.value);
+          } else {
+            console.log(chalk.gray("\nWaiting for file changes…\n"));
+          }
+          return deploy;
+        } catch (error) {
+          console.error(chalk.bgRed(chalk.whiteBright("\n Error while attempting deploy \n")));
+          console.error(error);
+          console.log(chalk.gray("\nWaiting for file changes…\n"));
         }
-        return deploy;
-      })
+      }),
+      filter(isDefined)
     );
 
     deploys$.subscribe();

package/src/runDeploy.ts

@@ -16,6 +16,8 @@ import { getChainId } from "viem/actions";
 import { postDeploy } from "./utils/utils/postDeploy";
 import { WorldDeploy } from "./deploy/common";
 import { tablegen } from "@latticexyz/store/codegen";
+import { worldgen } from "@latticexyz/world/node";
+import { getExistingContracts } from "./utils/getExistingContracts";
 
 export const deployOptions = {
   configPath: { type: "string", desc: "Path to the config file" },
@@ -57,10 +59,10 @@ export async function runDeploy(opts: DeployOptions): Promise<WorldDeploy> {
     )
   );
 
-  // Run forge build
+  // Run build
   if (!opts.skipBuild) {
     const outPath = path.join(srcDir, config.codegenDirectory);
-    await tablegen(config, outPath, remappings);
+    await Promise.all([tablegen(config, outPath, remappings), worldgen(config, getExistingContracts(srcDir), outPath)]);
     await forge(["build"], { profile });
     await execa("mud", ["abi-ts"], { stdio: "inherit" });
   }