@latticexyz/cli 2.0.0-alpha.75 → 2.0.0-alpha.78

package/dist/{chunk-MIGVHECZ.js → chunk-DO7OWTMM.js}

@@ -703,18 +703,43 @@ function renderTypesFromConfig(config) {
 
 // src/render-solidity/tablegen.ts
 import path3 from "path";
+
+// src/render-solidity/renderTableIndex.ts
+function renderTableIndex(options) {
+  return `${renderedSolidityHeader}
+
+${renderList(options, ({ outputPath, tableName, renderOptions: { structName, staticResourceData } }) => {
+    const imports = [tableName];
+    if (structName)
+      imports.push(structName);
+    if (staticResourceData)
+      imports.push(`${tableName}TableId`);
+    return `import { ${imports.join(", ")} } from "./${outputPath}";`;
+  })}
+`;
+}
+
+// src/render-solidity/tablegen.ts
+import { rmSync } from "fs";
 async function tablegen(config, outputBaseDirectory) {
   const allTableOptions = getTableOptions(config);
+  const uniqueTableDirectories = new Set(allTableOptions.map(({ outputPath }) => path3.dirname(outputPath)));
+  for (const tableDir of uniqueTableDirectories) {
+    rmSync(path3.join(outputBaseDirectory, tableDir), { recursive: true, force: true });
+  }
   for (const { outputPath, renderOptions } of allTableOptions) {
-    const fullOutputPath = path3.join(outputBaseDirectory, outputPath);
-    const output = renderTable(renderOptions);
-    formatAndWriteSolidity(output, fullOutputPath, "Generated table");
+    const fullOutputPath2 = path3.join(outputBaseDirectory, outputPath);
+    const output2 = renderTable(renderOptions);
+    formatAndWriteSolidity(output2, fullOutputPath2, "Generated table");
   }
   if (Object.keys(config.enums).length > 0) {
-    const fullOutputPath = path3.join(outputBaseDirectory, `${config.userTypesPath}.sol`);
-    const output = renderTypesFromConfig(config);
-    formatAndWriteSolidity(output, fullOutputPath, "Generated types file");
+    const fullOutputPath2 = path3.join(outputBaseDirectory, `${config.userTypesPath}.sol`);
+    const output2 = renderTypesFromConfig(config);
+    formatAndWriteSolidity(output2, fullOutputPath2, "Generated types file");
   }
+  const fullOutputPath = path3.join(outputBaseDirectory, `Tables.sol`);
+  const output = renderTableIndex(allTableOptions);
+  formatAndWriteSolidity(output, fullOutputPath, "Generated table index");
 }
 
 export {

package/dist/{chunk-S7JI7355.js → chunk-MN3HYFJK.js}

@@ -172,7 +172,8 @@ var StoreConfigUnrefined = z3.object({
   namespace: zSelector.default(""),
   storeImportPath: z3.string().default("@latticexyz/store/src/"),
   tables: zTablesConfig,
-  userTypesPath: z3.string().default("Types")
+  userTypesPath: z3.string().default("Types"),
+  codegenDirectory: z3.string().default("codegen")
 }).merge(zEnumsConfig);
 var zStoreConfig = StoreConfigUnrefined.superRefine(validateStoreConfig);
 function parseStoreConfig(config) {

package/dist/{chunk-2L44HXDV.js → chunk-TLEAEDUA.js}

@@ -1,12 +1,12 @@
 import {
   deploy
-} from "./chunk-QGY6YXME.js";
+} from "./chunk-XUNWAEP7.js";
 import {
   MUDError,
   loadStoreConfig,
   loadWorldConfig,
   logError
-} from "./chunk-S7JI7355.js";
+} from "./chunk-MN3HYFJK.js";
 import {
   execLog
 } from "./chunk-FFY7VTYB.js";
@@ -22,7 +22,7 @@ import {
   renderList,
   renderedSolidityHeader,
   tablegen
-} from "./chunk-MIGVHECZ.js";
+} from "./chunk-DO7OWTMM.js";
 import {
   tsgen
 } from "./chunk-TPZUS44H.js";
@@ -2956,9 +2956,9 @@ var commandModule3 = {
       compare: { type: "string", desc: "Compare to an existing gas report" }
     });
   },
-  async handler({ path: path6, save, compare: compare2 }) {
+  async handler({ path: path7, save, compare: compare2 }) {
     let gasReport = [];
-    for (const file of path6) {
+    for (const file of path7) {
       gasReport = gasReport.concat(await runGasReport(file));
     }
     const compareGasReport = [];
@@ -2990,14 +2990,14 @@ var commandModule3 = {
   }
 };
 var gas_report_default = commandModule3;
-async function runGasReport(path6) {
-  if (!path6.endsWith(".t.sol")) {
-    console.log("Skipping gas report for", chalk2.bold(path6), "(not a test file)");
+async function runGasReport(path7) {
+  if (!path7.endsWith(".t.sol")) {
+    console.log("Skipping gas report for", chalk2.bold(path7), "(not a test file)");
     return [];
   }
-  console.log("Running gas report for", chalk2.bold(path6));
+  console.log("Running gas report for", chalk2.bold(path7));
   const gasReport = [];
-  const fileContents = readFileSync(path6, "utf8");
+  const fileContents = readFileSync(path7, "utf8");
   let newFile = fileContents;
   const functionRegex = new RegExp(/function (.*){/g);
   let functionMatch;
@@ -3021,7 +3021,7 @@ console.log("GAS REPORT: ${name} [${functionCall.replaceAll('"', '\\"')}]:", _ga
     );
   }
   newFile = newFile.replace(/pure/g, "view");
-  const tempFileName = path6.replace(/\.t\.sol$/, "MudGasReport.t.sol");
+  const tempFileName = path7.replace(/\.t\.sol$/, "MudGasReport.t.sol");
   writeFileSync(tempFileName, newFile);
   const child = execa("forge", ["test", "--match-path", tempFileName, "-vvv"], {
     stdio: ["inherit", "pipe", "inherit"]
@@ -3042,7 +3042,7 @@ console.log("GAS REPORT: ${name} [${functionCall.replaceAll('"', '\\"')}]:", _ga
     const name = gasReportMatch[1];
     const functionCall = gasReportMatch[2].replace(";", "");
     const gasUsed = gasReportMatch[3];
-    gasReport.push({ source: path6, name, functionCall, gasUsed: parseInt(gasUsed) });
+    gasReport.push({ source: path7, name, functionCall, gasUsed: parseInt(gasUsed) });
   }
   return gasReport;
 }
@@ -3066,10 +3066,10 @@ function printGasReport(gasReport, compare2) {
   const rows = [headers, ...values];
   console.log(table(rows, { border: getBorderCharacters("norc") }));
 }
-function saveGasReport(gasReport, path6) {
-  console.log(chalk2.bold(`Saving gas report to ${path6}`));
+function saveGasReport(gasReport, path7) {
+  console.log(chalk2.bold(`Saving gas report to ${path7}`));
   const serializedGasReport = gasReport.map((entry) => `(${entry.source}) | ${entry.name} [${entry.functionCall}]: ${entry.gasUsed}`).join("\n");
-  writeFileSync(path6, serializedGasReport);
+  writeFileSync(path7, serializedGasReport);
 }
 
 // src/commands/hello.ts
@@ -3090,6 +3090,7 @@ var commandModule4 = {
 var hello_default = commandModule4;
 
 // src/commands/tablegen.ts
+import path2 from "path";
 var commandModule5 = {
   command: "tablegen",
   describe: "Autogenerate MUD Store table libraries based on the config file",
@@ -3099,9 +3100,9 @@ var commandModule5 = {
     });
   },
   async handler({ configPath }) {
-    const srcDirectory = await getSrcDirectory();
     const config = await loadStoreConfig(configPath);
-    await tablegen(config, srcDirectory);
+    const srcDir = await getSrcDirectory();
+    await tablegen(config, path2.join(srcDir, config.codegenDirectory));
     process.exit(0);
   }
 };
@@ -3129,7 +3130,7 @@ var tsgen_default = commandModule6;
 // src/commands/deploy-v2.ts
 import chalk3 from "chalk";
 import glob from "glob";
-import path2, { basename } from "path";
+import path3, { basename } from "path";
 import { mkdirSync, writeFileSync as writeFileSync2 } from "fs";
 
 // src/utils/getChainId.ts
@@ -3172,7 +3173,7 @@ async function deployHandler(args) {
     await forge(["clean"], { profile });
   await forge(["build"], { profile });
   const srcDir = await getSrcDirectory();
-  const existingContracts = glob.sync(`${srcDir}/**/*.sol`).map((path6) => basename(path6, ".sol"));
+  const existingContracts = glob.sync(`${srcDir}/**/*.sol`).map((path7) => basename(path7, ".sol"));
   const worldConfig = await loadWorldConfig(configPath, existingContracts);
   const storeConfig = await loadStoreConfig(configPath);
   const mudConfig = { ...worldConfig, ...storeConfig };
@@ -3185,10 +3186,10 @@ async function deployHandler(args) {
     const deploymentInfo = await deploy(mudConfig, { ...args, rpc, privateKey });
     if (args.saveDeployment) {
       const chainId = await getChainId(rpc);
-      const outputDir = path2.join(mudConfig.deploysDirectory, chainId.toString());
+      const outputDir = path3.join(mudConfig.deploysDirectory, chainId.toString());
       mkdirSync(outputDir, { recursive: true });
-      writeFileSync2(path2.join(outputDir, "latest.json"), JSON.stringify(deploymentInfo, null, 2));
-      writeFileSync2(path2.join(outputDir, Date.now() + ".json"), JSON.stringify(deploymentInfo, null, 2));
+      writeFileSync2(path3.join(outputDir, "latest.json"), JSON.stringify(deploymentInfo, null, 2));
+      writeFileSync2(path3.join(outputDir, Date.now() + ".json"), JSON.stringify(deploymentInfo, null, 2));
       console.log(chalk3.bgGreen(chalk3.whiteBright(`
  Deployment result (written to ${outputDir}): 
 `)));
@@ -3215,11 +3216,11 @@ var deploy_v2_default = commandModule7;
 
 // src/commands/worldgen.ts
 import glob2 from "glob";
-import path4, { basename as basename2 } from "path";
+import path5, { basename as basename2 } from "path";
 
 // src/render-solidity/worldgen.ts
 import { readFileSync as readFileSync2 } from "fs";
-import path3 from "path";
+import path4 from "path";
 
 // src/utils/contractToInterface.ts
 import { parse, visit } from "@solidity-parser/parser";
@@ -3375,7 +3376,7 @@ interface ${interfaceName} is ${renderArguments(["IStore", "IWorldCore", ...impo
 
 // src/render-solidity/worldgen.ts
 async function worldgen(config, existingContracts, outputBaseDirectory) {
-  const worldgenBaseDirectory = path3.join(outputBaseDirectory, config.worldgenDirectory);
+  const worldgenBaseDirectory = path4.join(outputBaseDirectory, config.worldgenDirectory);
   const systems = existingContracts.filter(({ basename: basename3 }) => Object.keys(config.systems).includes(basename3));
   const systemInterfaceImports = [];
   for (const system of systems) {
@@ -3394,7 +3395,7 @@ async function worldgen(config, existingContracts, outputBaseDirectory) {
       functions,
       imports
     });
-    const fullOutputPath2 = path3.join(worldgenBaseDirectory, systemInterfaceName + ".sol");
+    const fullOutputPath2 = path4.join(worldgenBaseDirectory, systemInterfaceName + ".sol");
     await formatAndWriteSolidity(output2, fullOutputPath2, "Generated system interface");
     systemInterfaceImports.push({
       symbol: systemInterfaceName,
@@ -3408,7 +3409,7 @@ async function worldgen(config, existingContracts, outputBaseDirectory) {
     storeImportPath: config.storeImportPath,
     worldImportPath: config.worldImportPath
   });
-  const fullOutputPath = path3.join(worldgenBaseDirectory, config.worldInterfaceName + ".sol");
+  const fullOutputPath = path4.join(worldgenBaseDirectory, config.worldInterfaceName + ".sol");
   await formatAndWriteSolidity(output, fullOutputPath, "Generated system interface");
 }
 
@@ -3426,9 +3427,9 @@ var commandModule8 = {
   async handler(args) {
     const { configPath, clean } = args;
     const srcDir = await getSrcDirectory();
-    const existingContracts = glob2.sync(`${srcDir}/**/*.sol`).map((path6) => ({
-      path: path6,
-      basename: basename2(path6, ".sol")
+    const existingContracts = glob2.sync(`${srcDir}/**/*.sol`).map((path7) => ({
+      path: path7,
+      basename: basename2(path7, ".sol")
     }));
     const worldConfig = await loadWorldConfig(
       configPath,
@@ -3436,9 +3437,10 @@ var commandModule8 = {
     );
     const storeConfig = await loadStoreConfig(configPath);
     const mudConfig = { ...worldConfig, ...storeConfig };
+    const outputBaseDirectory = path5.join(srcDir, mudConfig.codegenDirectory);
     if (clean)
-      rmSync3(path4.join(srcDir, worldConfig.worldgenDirectory), { recursive: true, force: true });
-    await worldgen(mudConfig, existingContracts, srcDir);
+      rmSync3(path5.join(outputBaseDirectory, mudConfig.worldgenDirectory), { recursive: true, force: true });
+    await worldgen(mudConfig, existingContracts, outputBaseDirectory);
     process.exit(0);
   }
 };
@@ -3447,12 +3449,12 @@ var worldgen_default = commandModule8;
 // src/commands/set-version.ts
 import chalk4 from "chalk";
 import { existsSync, readFileSync as readFileSync3, rmSync as rmSync4, writeFileSync as writeFileSync3 } from "fs";
-import path5 from "path";
+import path6 from "path";
 
 // package.json
 var package_default = {
   name: "@latticexyz/cli",
-  version: "2.0.0-alpha.75+406a002d",
+  version: "2.0.0-alpha.78+cf5f4bfe",
   description: "Command line interface for mud",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -3479,7 +3481,7 @@ var package_default = {
     release: "npm publish --access=public"
   },
   devDependencies: {
-    "@latticexyz/store": "^2.0.0-alpha.75+406a002d",
+    "@latticexyz/store": "^2.0.0-alpha.78+cf5f4bfe",
     "@types/ejs": "^3.1.1",
     "@types/glob": "^7.2.0",
     "@types/node": "^17.0.34",
@@ -3492,10 +3494,10 @@ var package_default = {
   dependencies: {
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@latticexyz/schema-type": "^2.0.0-alpha.75+406a002d",
-    "@latticexyz/services": "^2.0.0-alpha.75+406a002d",
-    "@latticexyz/solecs": "^2.0.0-alpha.75+406a002d",
-    "@latticexyz/std-contracts": "^2.0.0-alpha.75+406a002d",
+    "@latticexyz/schema-type": "^2.0.0-alpha.78+cf5f4bfe",
+    "@latticexyz/services": "^2.0.0-alpha.78+cf5f4bfe",
+    "@latticexyz/solecs": "^2.0.0-alpha.78+cf5f4bfe",
+    "@latticexyz/std-contracts": "^2.0.0-alpha.78+cf5f4bfe",
     "@solidity-parser/parser": "^0.16.0",
     "@typechain/ethers-v5": "^10.1.1",
     chalk: "^5.0.1",
@@ -3522,7 +3524,7 @@ var package_default = {
     zod: "^3.21.4",
     "zod-validation-error": "^1.0.1"
   },
-  gitHead: "406a002d58cbdb3f65af5bb47a2c7791ac93d5f2"
+  gitHead: "cf5f4bfe0d1d14e70efbf10ebef47d39f39e7239"
 };
 
 // src/commands/set-version.ts
@@ -3552,7 +3554,7 @@ var commandModule9 = {
       const { workspaces } = updatePackageJson(rootPath, options);
       if (workspaces) {
         for (const workspace of workspaces) {
-          const filePath = path5.join(workspace, "/package.json");
+          const filePath = path6.join(workspace, "/package.json");
           updatePackageJson(filePath, options);
         }
       }
@@ -3565,7 +3567,7 @@ var commandModule9 = {
 };
 function updatePackageJson(filePath, options) {
   const { backup, restore, force, mudVersion } = options;
-  const backupFilePath = path5.join(path5.dirname(filePath), BACKUP_FILE);
+  const backupFilePath = path6.join(path6.dirname(filePath), BACKUP_FILE);
   if (backup && !force && existsSync(backupFilePath)) {
     throw new MUDError(
       `A backup file already exists at ${backupFilePath}.
@@ -3613,12 +3615,12 @@ Use --force to overwrite it or --restore to restore it.`
   }
   return packageJson;
 }
-function readPackageJson(path6) {
+function readPackageJson(path7) {
   try {
-    const jsonString = readFileSync3(path6, "utf8");
+    const jsonString = readFileSync3(path7, "utf8");
     return JSON.parse(jsonString);
   } catch {
-    throw new MUDError("Could not read JSON at " + path6);
+    throw new MUDError("Could not read JSON at " + path7);
   }
 }
 async function getCanaryVersion(pkg) {