@latticexyz/cli 1.31.0 → 1.31.2

package/dist/commands/trace.js

@@ -53733,7 +53733,7 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
+        exports2.readFile = readFile2;
         exports2.readFileSync = readFileSync3;
         var _fs = _interopRequireDefault(require("fs"));
         function _interopRequireDefault(obj) {
@@ -53752,7 +53752,7 @@ ${error.message}`;
             });
           });
         }
-        async function readFile(filepath, options = {}) {
+        async function readFile2(filepath, options = {}) {
           const throwNotFound = options.throwNotFound === true;
           try {
             const content = await fsReadFileAsync(filepath, "utf8");
@@ -183033,8 +183033,8 @@ ${error.message}`;
             cb(null, x);
           }
         };
-        var defaultReadPackage = function defaultReadPackage2(readFile, pkgfile, cb) {
-          readFile(pkgfile, function(readFileErr, body) {
+        var defaultReadPackage = function defaultReadPackage2(readFile2, pkgfile, cb) {
+          readFile2(pkgfile, function(readFileErr, body) {
             if (readFileErr)
               cb(readFileErr);
             else {
@@ -183070,7 +183070,7 @@ ${error.message}`;
           opts = normalizeOptions(x, opts);
           var isFile = opts.isFile || defaultIsFile;
           var isDirectory = opts.isDirectory || defaultIsDir;
-          var readFile = opts.readFile || fs.readFile;
+          var readFile2 = opts.readFile || fs.readFile;
           var realpath = opts.realpath || defaultRealpath;
           var readPackage = opts.readPackage || defaultReadPackage;
           if (opts.readFile && opts.readPackage) {
@@ -183202,7 +183202,7 @@ ${error.message}`;
               isFile(pkgfile, function(err2, ex) {
                 if (!ex)
                   return loadpkg(path2.dirname(dir), cb2);
-                readPackage(readFile, pkgfile, function(err3, pkgParam) {
+                readPackage(readFile2, pkgfile, function(err3, pkgParam) {
                   if (err3)
                     cb2(err3);
                   var pkg = pkgParam;
@@ -183230,7 +183230,7 @@ ${error.message}`;
                   return cb2(err2);
                 if (!ex)
                   return loadAsFile(path2.join(x2, "index"), fpkg, cb2);
-                readPackage(readFile, pkgfile, function(err3, pkgParam) {
+                readPackage(readFile2, pkgfile, function(err3, pkgParam) {
                   if (err3)
                     return cb2(err3);
                   var pkg = pkgParam;
@@ -216206,9 +216206,11 @@ function keccak256(data) {
 }
 
 // src/utils/codegen.ts
+var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/types.js

@@ -18305,7 +18305,7 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
+        exports2.readFile = readFile2;
         exports2.readFileSync = readFileSync2;
         var _fs = _interopRequireDefault(require("fs"));
         function _interopRequireDefault(obj) {
@@ -18324,7 +18324,7 @@ ${error.message}`;
             });
           });
         }
-        async function readFile(filepath, options = {}) {
+        async function readFile2(filepath, options = {}) {
           const throwNotFound = options.throwNotFound === true;
           try {
             const content = await fsReadFileAsync(filepath, "utf8");
@@ -147605,8 +147605,8 @@ ${error.message}`;
             cb(null, x);
           }
         };
-        var defaultReadPackage = function defaultReadPackage2(readFile, pkgfile, cb) {
-          readFile(pkgfile, function(readFileErr, body) {
+        var defaultReadPackage = function defaultReadPackage2(readFile2, pkgfile, cb) {
+          readFile2(pkgfile, function(readFileErr, body) {
             if (readFileErr)
               cb(readFileErr);
             else {
@@ -147642,7 +147642,7 @@ ${error.message}`;
           opts = normalizeOptions(x, opts);
           var isFile = opts.isFile || defaultIsFile;
           var isDirectory = opts.isDirectory || defaultIsDir;
-          var readFile = opts.readFile || fs.readFile;
+          var readFile2 = opts.readFile || fs.readFile;
           var realpath = opts.realpath || defaultRealpath;
           var readPackage = opts.readPackage || defaultReadPackage;
           if (opts.readFile && opts.readPackage) {
@@ -147774,7 +147774,7 @@ ${error.message}`;
               isFile(pkgfile, function(err2, ex) {
                 if (!ex)
                   return loadpkg(path4.dirname(dir), cb2);
-                readPackage(readFile, pkgfile, function(err3, pkgParam) {
+                readPackage(readFile2, pkgfile, function(err3, pkgParam) {
                   if (err3)
                     cb2(err3);
                   var pkg = pkgParam;
@@ -147802,7 +147802,7 @@ ${error.message}`;
                   return cb2(err2);
                 if (!ex)
                   return loadAsFile(path4.join(x2, "index"), fpkg, cb2);
-                readPackage(readFile, pkgfile, function(err3, pkgParam) {
+                readPackage(readFile2, pkgfile, function(err3, pkgParam) {
                   if (err3)
                     return cb2(err3);
                   var pkg = pkgParam;
@@ -180821,9 +180821,11 @@ function extractIdFromFile(path4) {
 }
 
 // src/utils/codegen.ts
+var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());
@@ -180845,7 +180847,11 @@ function getContractsInDir(dir, exclude) {
   return (0, import_fs2.readdirSync)(dir).filter((item) => item.includes(".sol")).map((item) => item.replace(".sol", "")).filter((item) => !(exclude == null ? void 0 : exclude.includes(item)));
 }
 function copyAbi(inDir, outDir, contract) {
-  return (0, import_fs2.copyFileSync)(import_path2.default.join(inDir, contract + ".sol", contract + ".json"), import_path2.default.join(outDir, contract + ".json"));
+  try {
+    return (0, import_fs2.copyFileSync)(import_path2.default.join(inDir, contract + ".sol", contract + ".json"), import_path2.default.join(outDir, contract + ".json"));
+  } catch (e) {
+    console.warn(e);
+  }
 }
 function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "IComponent"]) {
   console.log(`Cleaning output directory (${abiOut}})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "1.31.0",
+  "version": "1.31.2",
   "description": "Command line interface for mud",
   "main": "dist/index.js",
   "license": "MIT",
@@ -37,10 +37,10 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "@latticexyz/services": "^1.31.0",
-    "@latticexyz/solecs": "^1.31.0",
-    "@latticexyz/std-contracts": "^1.31.0",
-    "@latticexyz/utils": "^1.31.0",
+    "@latticexyz/services": "^1.31.2",
+    "@latticexyz/solecs": "^1.31.2",
+    "@latticexyz/std-contracts": "^1.31.2",
+    "@latticexyz/utils": "^1.31.2",
     "@typechain/ethers-v5": "^10.1.1",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
@@ -70,5 +70,5 @@
   "pkg": {
     "scripts": "build/**/*.js"
   },
-  "gitHead": "a1a0d627e3800039b3b9179a23927aa599bc6e2a"
+  "gitHead": "bdcbdd6cb1a056779b73307acce20eccc65ad062"
 }

package/src/commands/codegen-libdeploy.ts

@@ -1,6 +1,4 @@
 import type { Arguments, CommandBuilder } from "yargs";
-import ejs from "ejs";
-import { readFileSync, writeFileSync } from "fs";
 import { generateLibDeploy } from "../utils";
 
 type Options = {

package/src/utils/build.ts

@@ -18,14 +18,14 @@ function getContractsInDir(dir: string, exclude?: string[]) {
 }
 
 function copyAbi(inDir: string, outDir: string, contract: string) {
-  return copyFileSync(path.join(inDir, contract + ".sol", contract + ".json"), path.join(outDir, contract + ".json"));
+  try {
+    return copyFileSync(path.join(inDir, contract + ".sol", contract + ".json"), path.join(outDir, contract + ".json"));
+  } catch (e) {
+    console.warn(e);
+  }
 }
 
-export function filterAbi(
-  abiIn = "./out",
-  abiOut = "./abi",
-  exclude: string[] = ["Component", "IComponent"]
-) {
+export function filterAbi(abiIn = "./out", abiOut = "./abi", exclude: string[] = ["Component", "IComponent"]) {
   // Clean our dir
   console.log(`Cleaning output directory (${abiOut}})`);
   rmSync(abiOut, { recursive: true, force: true });

package/src/utils/codegen.ts

@@ -1,12 +1,14 @@
-import { readFileSync, writeFileSync } from "fs";
+import { readFile, writeFile } from "fs/promises";
 import ejs from "ejs";
 import path from "path";
 
 const contractsDir = path.join(__dirname, "../../src/contracts");
 
+const stubLibDeploy = readFile(path.join(contractsDir, "LibDeploy.sol"));
+
 export async function generateLibDeploy(configPath: string, out: string, systems?: string | string[]) {
   // Parse config
-  const config = JSON.parse(readFileSync(configPath, { encoding: "utf8" }));
+  const config = JSON.parse(await readFile(configPath, { encoding: "utf8" }));
 
   // Filter systems
   if (systems) {
@@ -20,11 +22,11 @@ export async function generateLibDeploy(configPath: string, out: string, systems
   console.log("Generating deployment script");
   const LibDeploy = await ejs.renderFile(path.join(contractsDir, "LibDeploy.ejs"), config, { async: true });
   const libDeployPath = path.join(out, "LibDeploy.sol");
-  writeFileSync(libDeployPath, LibDeploy);
+  await writeFile(libDeployPath, LibDeploy);
 
   return libDeployPath;
 }
 
 export async function resetLibDeploy(out: string) {
-  writeFileSync(path.join(out, "LibDeploy.sol"), readFileSync(path.join(contractsDir, "LibDeploy.sol")));
+  await writeFile(path.join(out, "LibDeploy.sol"), await stubLibDeploy);
 }

package/src/utils/deploy.ts

@@ -1,6 +1,5 @@
 import { constants, Wallet } from "ethers";
-import { rmSync } from "fs";
-import { generateLibDeploy } from "./codegen";
+import { generateLibDeploy, resetLibDeploy } from "./codegen";
 import { findLog } from "./findLog";
 import { generateTypes } from "./types";
 import { execa } from "execa";
@@ -77,7 +76,7 @@ export async function generateAndDeploy(args: DeployOptions) {
   } finally {
     // Remove generated LibDeploy
     console.log("Cleaning up deployment script");
-    if (libDeployPath) rmSync(libDeployPath);
+    if (libDeployPath) resetLibDeploy(contractsDir);
   }
 
   return { deployedWorldAddress, initialBlockNumber };

package/src/utils/hsr.ts

@@ -16,9 +16,19 @@ function extractImports(path: string): string[] {
   return regexResult;
 }
 
-function findDependencies(file: string, dependencyGraph: { [file: string]: string[] }): string[] {
+function findDependencies(
+  file: string,
+  dependencyGraph: { [file: string]: string[] },
+  visited: string[] = []
+): string[] {
   const dependencies = dependencyGraph[file] ?? [];
-  const subDependencies = dependencies.flatMap((d) => findDependencies(d, dependencyGraph));
+  const subDependencies = dependencies.flatMap((d) => {
+    if (visited.includes(d)) {
+      console.warn("Circular dependency detected: ", d, dependencyGraph[d]);
+      return [];
+    }
+    return findDependencies(d, dependencyGraph, [...visited, d]);
+  });
   return [...new Set([...dependencies, ...subDependencies])];
 }
 
@@ -50,9 +60,9 @@ export function hsr(root: string, replaceSystems: (systems: string[]) => Promise
     if (event === "change") {
       // Find all files depending on the changed file
       const dependencies = findDependencies(changedFile, dependencyGraph);
-      const changedSystems = [changedFile, ...dependencies]
-        .filter((f) => systems.has(f))
-        .map((f) => f.replace(".sol", ""));
+      const changedSystems = [
+        ...new Set([changedFile, ...dependencies].filter((f) => systems.has(f)).map((f) => f.replace(".sol", ""))),
+      ];
       console.log("Systems to replace", changedSystems);
       if (changedSystems.length > 0) await replaceSystems(changedSystems);
       console.log("Watching system file changes...");