@latticexyz/cli 1.31.0 → 1.31.1

package/dist/commands/call-system.js

@@ -41559,7 +41559,7 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
+        exports2.readFile = readFile2;
         exports2.readFileSync = readFileSync;
         var _fs = _interopRequireDefault(require("fs"));
         function _interopRequireDefault(obj) {
@@ -41578,7 +41578,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");
@@ -170859,8 +170859,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 {
@@ -170896,7 +170896,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) {
@@ -171028,7 +171028,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;
@@ -171056,7 +171056,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;
@@ -204023,9 +204023,11 @@ function execLog(command2, options) {
 var IDregex = new RegExp(new RegExp('(?<=uint256 constant ID = uint256\\(keccak256\\(")(.*)(?="\\))'));
 
 // 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/codegen-libdeploy.js

@@ -18305,8 +18305,8 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
-        exports2.readFileSync = readFileSync2;
+        exports2.readFile = readFile2;
+        exports2.readFileSync = readFileSync;
         var _fs = _interopRequireDefault(require("fs"));
         function _interopRequireDefault(obj) {
           return obj && obj.__esModule ? 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");
@@ -18336,7 +18336,7 @@ ${error.message}`;
             throw error;
           }
         }
-        function readFileSync2(filepath, options = {}) {
+        function readFileSync(filepath, options = {}) {
           const throwNotFound = options.throwNotFound === true;
           try {
             const content = _fs.default.readFileSync(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(path2.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(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;
@@ -148154,8 +148154,8 @@ ${error.message}`;
           }
           return x;
         };
-        var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync2, pkgfile) {
-          var body = readFileSync2(pkgfile);
+        var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync, pkgfile) {
+          var body = readFileSync(pkgfile);
           try {
             var pkg = JSON.parse(body);
             return pkg;
@@ -148175,7 +148175,7 @@ ${error.message}`;
           }
           var opts = normalizeOptions(x, options);
           var isFile = opts.isFile || defaultIsFile;
-          var readFileSync2 = opts.readFileSync || fs.readFileSync;
+          var readFileSync = opts.readFileSync || fs.readFileSync;
           var isDirectory = opts.isDirectory || defaultIsDir;
           var realpathSync = opts.realpathSync || defaultRealpathSync;
           var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
@@ -148237,7 +148237,7 @@ ${error.message}`;
             if (!isFile(pkgfile)) {
               return loadpkg(path2.dirname(dir));
             }
-            var pkg = readPackageSync(readFileSync2, pkgfile);
+            var pkg = readPackageSync(readFileSync, pkgfile);
             if (pkg && opts.packageFilter) {
               pkg = opts.packageFilter(pkg, dir);
             }
@@ -148250,7 +148250,7 @@ ${error.message}`;
             var pkgfile = path2.join(maybeRealpathSync(realpathSync, x2, opts), "/package.json");
             if (isFile(pkgfile)) {
               try {
-                var pkg = readPackageSync(readFileSync2, pkgfile);
+                var pkg = readPackageSync(readFileSync, pkgfile);
               } catch (e) {
               }
               if (pkg && opts.packageFilter) {
@@ -180789,13 +180789,14 @@ module.exports = __toCommonJS(codegen_libdeploy_exports);
 var IDregex = new RegExp(new RegExp('(?<=uint256 constant ID = uint256\\(keccak256\\(")(.*)(?="\\))'));
 
 // src/utils/codegen.ts
-var import_fs = require("fs");
+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"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
-    const config = JSON.parse((0, import_fs.readFileSync)(configPath, { encoding: "utf8" }));
+    const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));
     if (systems) {
       const systemsArray = Array.isArray(systems) ? systems : [systems];
       config.systems = config.systems.filter((system) => systemsArray.includes(system.name));
@@ -180805,7 +180806,7 @@ function generateLibDeploy(configPath, out, systems) {
     console.log("Generating deployment script");
     const LibDeploy = yield import_ejs.default.renderFile(import_path.default.join(contractsDir, "LibDeploy.ejs"), config, { async: true });
     const libDeployPath = import_path.default.join(out, "LibDeploy.sol");
-    (0, import_fs.writeFileSync)(libDeployPath, LibDeploy);
+    yield (0, import_promises.writeFile)(libDeployPath, LibDeploy);
     return libDeployPath;
   });
 }

package/dist/commands/create.js

@@ -18305,7 +18305,7 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
+        exports2.readFile = readFile2;
         exports2.readFileSync = readFileSync;
         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(path2.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(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;
@@ -180815,9 +180815,11 @@ function execLog(command2, options) {
 var IDregex = new RegExp(new RegExp('(?<=uint256 constant ID = uint256\\(keccak256\\(")(.*)(?="\\))'));
 
 // 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/deploy-contracts.js

@@ -53750,8 +53750,8 @@ ${error.message}`;
         Object.defineProperty(exports2, "__esModule", {
           value: true
         });
-        exports2.readFile = readFile;
-        exports2.readFileSync = readFileSync4;
+        exports2.readFile = readFile2;
+        exports2.readFileSync = readFileSync3;
         var _fs = _interopRequireDefault(require("fs"));
         function _interopRequireDefault(obj) {
           return obj && obj.__esModule ? obj : {
@@ -53769,7 +53769,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");
@@ -53781,7 +53781,7 @@ ${error.message}`;
             throw error;
           }
         }
-        function readFileSync4(filepath, options = {}) {
+        function readFileSync3(filepath, options = {}) {
           const throwNotFound = options.throwNotFound === true;
           try {
             const content = _fs.default.readFileSync(filepath, "utf8");
@@ -183050,8 +183050,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 {
@@ -183087,7 +183087,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) {
@@ -183219,7 +183219,7 @@ ${error.message}`;
               isFile(pkgfile, function(err2, ex) {
                 if (!ex)
                   return loadpkg(path6.dirname(dir), cb2);
-                readPackage(readFile, pkgfile, function(err3, pkgParam) {
+                readPackage(readFile2, pkgfile, function(err3, pkgParam) {
                   if (err3)
                     cb2(err3);
                   var pkg = pkgParam;
@@ -183247,7 +183247,7 @@ ${error.message}`;
                   return cb2(err2);
                 if (!ex)
                   return loadAsFile(path6.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;
@@ -183599,8 +183599,8 @@ ${error.message}`;
           }
           return x;
         };
-        var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync4, pkgfile) {
-          var body = readFileSync4(pkgfile);
+        var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync3, pkgfile) {
+          var body = readFileSync3(pkgfile);
           try {
             var pkg = JSON.parse(body);
             return pkg;
@@ -183620,7 +183620,7 @@ ${error.message}`;
           }
           var opts = normalizeOptions(x, options);
           var isFile = opts.isFile || defaultIsFile;
-          var readFileSync4 = opts.readFileSync || fs.readFileSync;
+          var readFileSync3 = opts.readFileSync || fs.readFileSync;
           var isDirectory = opts.isDirectory || defaultIsDir;
           var realpathSync = opts.realpathSync || defaultRealpathSync;
           var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
@@ -183682,7 +183682,7 @@ ${error.message}`;
             if (!isFile(pkgfile)) {
               return loadpkg(path6.dirname(dir));
             }
-            var pkg = readPackageSync(readFileSync4, pkgfile);
+            var pkg = readPackageSync(readFileSync3, pkgfile);
             if (pkg && opts.packageFilter) {
               pkg = opts.packageFilter(pkg, dir);
             }
@@ -183695,7 +183695,7 @@ ${error.message}`;
             var pkgfile = path6.join(maybeRealpathSync(realpathSync, x2, opts), "/package.json");
             if (isFile(pkgfile)) {
               try {
-                var pkg = readPackageSync(readFileSync4, pkgfile);
+                var pkg = readPackageSync(readFileSync3, pkgfile);
               } catch (e) {
               }
               if (pkg && opts.packageFilter) {
@@ -216275,13 +216275,14 @@ function extractIdFromFile(path6) {
 }
 
 // src/utils/codegen.ts
-var import_fs2 = require("fs");
+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"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
-    const config = JSON.parse((0, import_fs2.readFileSync)(configPath, { encoding: "utf8" }));
+    const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));
     if (systems) {
       const systemsArray = Array.isArray(systems) ? systems : [systems];
       config.systems = config.systems.filter((system) => systemsArray.includes(system.name));
@@ -216291,14 +216292,18 @@ function generateLibDeploy(configPath, out, systems) {
     console.log("Generating deployment script");
     const LibDeploy = yield import_ejs.default.renderFile(import_path.default.join(contractsDir, "LibDeploy.ejs"), config, { async: true });
     const libDeployPath = import_path.default.join(out, "LibDeploy.sol");
-    (0, import_fs2.writeFileSync)(libDeployPath, LibDeploy);
+    yield (0, import_promises.writeFile)(libDeployPath, LibDeploy);
     return libDeployPath;
   });
 }
+function resetLibDeploy(out) {
+  return __async(this, null, function* () {
+    yield (0, import_promises.writeFile)(import_path.default.join(out, "LibDeploy.sol"), yield stubLibDeploy);
+  });
+}
 
 // src/utils/deploy.ts
 var import_ethers = __toESM(require_lib33());
-var import_fs5 = require("fs");
 
 // src/utils/findLog.ts
 function findLog(deployLogLines, log) {
@@ -216313,29 +216318,33 @@ function findLog(deployLogLines, log) {
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());
 var import_glob = __toESM(require_glob3());
-var import_fs4 = require("fs");
+var import_fs3 = require("fs");
 var import_path3 = __toESM(require("path"));
 
 // src/utils/build.ts
-var import_fs3 = require("fs");
+var import_fs2 = require("fs");
 var import_path2 = __toESM(require("path"));
 function forgeBuild(out = "out", options) {
   if (options == null ? void 0 : options.clear) {
     console.log("Clearing forge build output directory", out);
-    (0, import_fs3.rmSync)(out, { recursive: true, force: true });
+    (0, import_fs2.rmSync)(out, { recursive: true, force: true });
   }
   return execLog("forge", ["build", "-o", out]);
 }
 function getContractsInDir(dir, exclude) {
-  return (0, import_fs3.readdirSync)(dir).filter((item) => item.includes(".sol")).map((item) => item.replace(".sol", "")).filter((item) => !(exclude == null ? void 0 : exclude.includes(item)));
+  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_fs3.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}})`);
-  (0, import_fs3.rmSync)(abiOut, { recursive: true, force: true });
-  (0, import_fs3.mkdirSync)(abiOut);
+  (0, import_fs2.rmSync)(abiOut, { recursive: true, force: true });
+  (0, import_fs2.mkdirSync)(abiOut);
   const include = ["Component", "System", "World", "LibQuery"];
   const contracts = getContractsInDir(abiIn, exclude).filter((item) => include.find((i) => item.includes(i)));
   console.log("Selected ABIs: ", contracts);
@@ -216350,7 +216359,7 @@ function generateAbiTypes(inputDir, outputDir, options) {
     var _a;
     if (options == null ? void 0 : options.clear) {
       console.log("Clearing typechain output directory", outputDir);
-      (0, import_fs4.rmSync)(outputDir, { recursive: true, force: true });
+      (0, import_fs3.rmSync)(outputDir, { recursive: true, force: true });
     }
     const cwd = (_a = options == null ? void 0 : options.cwd) != null ? _a : process.cwd();
     const allFiles = (0, import_typechain.glob)(cwd, [`${inputDir}/**/+([a-zA-Z0-9_]).json`]);
@@ -216368,10 +216377,10 @@ function generateSystemTypes(inputDir, outputDir, options) {
   return __async(this, null, function* () {
     if (options == null ? void 0 : options.clear) {
       console.log("Clearing system type output files", outputDir);
-      (0, import_fs4.rmSync)(import_path3.default.join(outputDir, "/SystemTypes.ts"), { force: true });
-      (0, import_fs4.rmSync)(import_path3.default.join(outputDir, "/SystemAbis.mts"), { force: true });
-      (0, import_fs4.rmSync)(import_path3.default.join(outputDir, "/SystemAbis.mjs"), { force: true });
-      (0, import_fs4.rmSync)(import_path3.default.join(outputDir, "/SystemMappings.ts"), { force: true });
+      (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemTypes.ts"), { force: true });
+      (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemAbis.mts"), { force: true });
+      (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemAbis.mjs"), { force: true });
+      (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemMappings.ts"), { force: true });
     }
     let abis = [];
     let systems = [];
@@ -216431,10 +216440,10 @@ ${systems.map((system, index) => `  "${ids[index]}": ${system}.abi,`).join("\n")
     console.log("SystemTypes.ts", SystemTypes);
     console.log("SystemAbis.mts", SystemAbis);
     console.log("SystemMappings.ts", SystemMappings);
-    (0, import_fs4.writeFileSync)(`${outputDir}/SystemTypes.ts`, SystemTypes);
-    (0, import_fs4.writeFileSync)(`${outputDir}/SystemAbis.mts`, SystemAbis);
-    (0, import_fs4.writeFileSync)(`${outputDir}/SystemAbis.mjs`, SystemAbis);
-    (0, import_fs4.writeFileSync)(`${outputDir}/SystemMappings.ts`, SystemMappings);
+    (0, import_fs3.writeFileSync)(`${outputDir}/SystemTypes.ts`, SystemTypes);
+    (0, import_fs3.writeFileSync)(`${outputDir}/SystemAbis.mts`, SystemAbis);
+    (0, import_fs3.writeFileSync)(`${outputDir}/SystemAbis.mjs`, SystemAbis);
+    (0, import_fs3.writeFileSync)(`${outputDir}/SystemMappings.ts`, SystemMappings);
   });
 }
 function generateTypes(abiDir, outputDir = "./types", options) {
@@ -217402,7 +217411,7 @@ function generateAndDeploy(args) {
     } finally {
       console.log("Cleaning up deployment script");
       if (libDeployPath)
-        (0, import_fs5.rmSync)(libDeployPath);
+        resetLibDeploy(contractsDir2);
     }
     return { deployedWorldAddress, initialBlockNumber };
   });
@@ -217410,17 +217419,23 @@ function generateAndDeploy(args) {
 
 // src/utils/hsr.ts
 var import_chokidar = __toESM(require_chokidar());
-var import_fs6 = require("fs");
+var import_fs4 = require("fs");
 var ImportsRegex = new RegExp(new RegExp('(?<=import ").*(?=";)|(?<=from ").*(?=";)', "g"));
 function extractImports(path6) {
-  const content = (0, import_fs6.readFileSync)(path6).toString();
+  const content = (0, import_fs4.readFileSync)(path6).toString();
   const regexResult = [...content.matchAll(ImportsRegex)].map((match) => match[0]).map((path7) => path7.split("/").at(-1));
   return regexResult;
 }
-function findDependencies(file, dependencyGraph) {
+function findDependencies(file, dependencyGraph, visited = []) {
   var _a;
   const dependencies = (_a = dependencyGraph[file]) != null ? _a : [];
-  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 [.../* @__PURE__ */ new Set([...dependencies, ...subDependencies])];
 }
 function hsr(root, replaceSystems) {
@@ -217442,7 +217457,9 @@ function hsr(root, replaceSystems) {
     }
     if (event === "change") {
       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)
         yield replaceSystems(changedSystems);