@latticexyz/cli 1.35.0 → 1.36.1

package/dist/commands/deploy-contracts.js

@@ -217178,18 +217178,33 @@ function execa(file, args, options) {
 // src/utils/build.ts
 var import_fs2 = require("fs");
 var import_path2 = __toESM(require("path"));
-async function forgeBuild(out = "out", options) {
+
+// src/utils/forgeConfig.ts
+async function getForgeConfig() {
+  const { stdout } = await execa("forge", ["config", "--json"], { stdio: ["inherit", "pipe", "pipe"] });
+  return JSON.parse(stdout);
+}
+async function getSrcDirectory() {
+  return (await getForgeConfig()).src;
+}
+async function getOutDirectory() {
+  return (await getForgeConfig()).out;
+}
+
+// src/utils/build.ts
+async function forgeBuild(options) {
   if (options?.clear) {
+    const out = await getOutDirectory();
     console.log("Clearing forge build output directory", out);
     (0, import_fs2.rmSync)(out, { recursive: true, force: true });
   }
   console.log("Running forge build");
-  const child = execa("forge", ["build", "-o", out], {
+  const child = execa("forge", ["build"], {
     stdio: ["inherit", "pipe", "inherit"]
   });
   return (await child).stdout;
 }
-function getContractsInDir(dir, exclude) {
+function getContractsInDirectory(dir, exclude) {
   return (0, import_fs2.readdirSync)(dir).filter((item) => item.includes(".sol")).map((item) => item.replace(".sol", "")).filter((item) => !exclude?.includes(item));
 }
 function copyAbi(inDir, outDir, contract) {
@@ -217204,7 +217219,7 @@ function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "I
   (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)));
+  const contracts = getContractsInDirectory(abiIn, exclude).filter((item) => include.find((i) => item.includes(i)));
   console.log("Selected ABIs: ", contracts);
   for (const contract of contracts) {
     if (contract.includes(".t"))
@@ -217214,6 +217229,9 @@ function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "I
   console.log("Successfully moved selected ABIs to ./abi");
 }
 
+// src/utils/constants.ts
+var systemsDir = "systems";
+
 // src/utils/types.ts
 async function generateAbiTypes(inputDir, outputDir, options) {
   if (options?.clear) {
@@ -217231,7 +217249,7 @@ async function generateAbiTypes(inputDir, outputDir, options) {
   });
   console.log(`Successfully generated ${result.filesGenerated} files`);
 }
-async function generateSystemTypes(inputDir, outputDir, options) {
+async function generateSystemTypes(outputDir, options) {
   if (options?.clear) {
     console.log("Clearing system type output files", outputDir);
     (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemTypes.ts"), { force: true });
@@ -217243,7 +217261,8 @@ async function generateSystemTypes(inputDir, outputDir, options) {
   let systems = [];
   let ids = [];
   let typePaths = [];
-  const systemsPath = `${inputDir}/*.sol`;
+  const srcDir = await getSrcDirectory();
+  const systemsPath = import_path3.default.join(srcDir, systemsDir, "*.sol");
   const [resolve, , promise] = deferred();
   (0, import_glob.default)(systemsPath, {}, (_, matches) => {
     systems = matches.map((path6) => {
@@ -217305,13 +217324,13 @@ ${systems.map((system, index) => `  "${ids[index]}": ${system}.abi,`).join("\n")
 async function generateTypes(abiDir, outputDir = "./types", options) {
   if (!abiDir) {
     console.log("Compiling contracts");
-    const buildOutput = "./out";
+    const buildOutput = await getOutDirectory();
     abiDir = "./abi";
-    await forgeBuild(buildOutput, options);
+    await forgeBuild(options);
     filterAbi(buildOutput, abiDir);
   }
   await generateAbiTypes(abiDir, import_path3.default.join(outputDir, "ethers-contracts"), options);
-  await generateSystemTypes("./src/systems", outputDir, options);
+  await generateSystemTypes(outputDir, options);
 }
 
 // src/utils/deploy.ts
@@ -217943,7 +217962,8 @@ var handler = async (args) => {
   }
   if (args.watch) {
     const { config, rpc, gasPrice } = args;
-    hsr("./src", async (systems) => {
+    const srcDir = await getSrcDirectory();
+    hsr(srcDir, async (systems) => {
       try {
         return await generateAndDeploy({
           config,

package/dist/commands/deploy.js

@@ -270319,18 +270319,33 @@ function execa(file, args, options) {
 // src/utils/build.ts
 var import_fs2 = require("fs");
 var import_path2 = __toESM(require("path"));
-async function forgeBuild(out = "out", options) {
+
+// src/utils/forgeConfig.ts
+async function getForgeConfig() {
+  const { stdout } = await execa("forge", ["config", "--json"], { stdio: ["inherit", "pipe", "pipe"] });
+  return JSON.parse(stdout);
+}
+async function getSrcDirectory() {
+  return (await getForgeConfig()).src;
+}
+async function getOutDirectory() {
+  return (await getForgeConfig()).out;
+}
+
+// src/utils/build.ts
+async function forgeBuild(options) {
   if (options?.clear) {
+    const out = await getOutDirectory();
     console.log("Clearing forge build output directory", out);
     (0, import_fs2.rmSync)(out, { recursive: true, force: true });
   }
   console.log("Running forge build");
-  const child = execa("forge", ["build", "-o", out], {
+  const child = execa("forge", ["build"], {
     stdio: ["inherit", "pipe", "inherit"]
   });
   return (await child).stdout;
 }
-function getContractsInDir(dir, exclude) {
+function getContractsInDirectory(dir, exclude) {
   return (0, import_fs2.readdirSync)(dir).filter((item) => item.includes(".sol")).map((item) => item.replace(".sol", "")).filter((item) => !exclude?.includes(item));
 }
 function copyAbi(inDir, outDir, contract) {
@@ -270345,7 +270360,7 @@ function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "I
   (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)));
+  const contracts = getContractsInDirectory(abiIn, exclude).filter((item) => include.find((i) => item.includes(i)));
   console.log("Selected ABIs: ", contracts);
   for (const contract of contracts) {
     if (contract.includes(".t"))
@@ -270355,6 +270370,9 @@ function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "I
   console.log("Successfully moved selected ABIs to ./abi");
 }
 
+// src/utils/constants.ts
+var systemsDir = "systems";
+
 // src/utils/types.ts
 async function generateAbiTypes(inputDir, outputDir, options) {
   if (options?.clear) {
@@ -270372,7 +270390,7 @@ async function generateAbiTypes(inputDir, outputDir, options) {
   });
   console.log(`Successfully generated ${result.filesGenerated} files`);
 }
-async function generateSystemTypes(inputDir, outputDir, options) {
+async function generateSystemTypes(outputDir, options) {
   if (options?.clear) {
     console.log("Clearing system type output files", outputDir);
     (0, import_fs3.rmSync)(import_path3.default.join(outputDir, "/SystemTypes.ts"), { force: true });
@@ -270384,7 +270402,8 @@ async function generateSystemTypes(inputDir, outputDir, options) {
   let systems = [];
   let ids = [];
   let typePaths = [];
-  const systemsPath = `${inputDir}/*.sol`;
+  const srcDir = await getSrcDirectory();
+  const systemsPath = import_path3.default.join(srcDir, systemsDir, "*.sol");
   const [resolve, , promise] = deferred();
   (0, import_glob.default)(systemsPath, {}, (_, matches) => {
     systems = matches.map((path6) => {
@@ -270446,13 +270465,13 @@ ${systems.map((system, index) => `  "${ids[index]}": ${system}.abi,`).join("\n")
 async function generateTypes(abiDir, outputDir = "./types", options) {
   if (!abiDir) {
     console.log("Compiling contracts");
-    const buildOutput = "./out";
+    const buildOutput = await getOutDirectory();
     abiDir = "./abi";
-    await forgeBuild(buildOutput, options);
+    await forgeBuild(options);
     filterAbi(buildOutput, abiDir);
   }
   await generateAbiTypes(abiDir, import_path3.default.join(outputDir, "ethers-contracts"), options);
-  await generateSystemTypes("./src/systems", outputDir, options);
+  await generateSystemTypes(outputDir, options);
 }
 
 // src/utils/deploy.ts