@latticexyz/cli 2.0.0-alpha.49 → 2.0.0-alpha.5

package/src/commands/gas-report.ts

@@ -39,6 +39,8 @@ type GasReportEntry = {
 
 type GasReport = GasReportEntry[];
 
+const tempFileSuffix = "MudGasReport";
+
 const commandModule: CommandModule<Options, Options> = {
   command: "gas-report",
 
@@ -52,43 +54,43 @@ const commandModule: CommandModule<Options, Options> = {
     });
   },
 
-  async handler({ path, save, compare }) {
-    let gasReport: GasReport = [];
+  async handler({ path: files, save, compare }) {
+    const validFiles = files.filter((file) => file.endsWith(".t.sol"));
+    const tempFiles = await Promise.all(validFiles.map((file) => createGasReport(file)));
+
+    process.once("SIGINT", () => {
+      console.log("caught sigint, deleting temp files");
+      tempFiles.forEach((file) => rmSync(file));
+    });
 
-    // Iterate through all files provided in the path
-    for (const file of path) {
-      gasReport = gasReport.concat(await runGasReport(file));
+    let gasReport: GasReport;
+    try {
+      gasReport = await runGasReport();
+    } catch {
+      setTimeout(() => process.exit());
+      return;
+    } finally {
+      // Delete the temporary files
+      tempFiles.forEach((file) => rmSync(file));
     }
 
     // If this gas report should be compared to an existing one, load the existing one
-    const compareGasReport: GasReport = [];
     if (compare) {
       try {
-        const compareFileContents = readFileSync(compare, "utf8");
-        // Create a regex to extract the name, function call and gas used
-        const compareGasReportRegex = new RegExp(/\((.*)\) \| (.*) \[(.*)\]: (.*)/g);
-        // Loop through the matches and add the resuls to the compareGasReport
-        let compareGasReportMatch;
-        while ((compareGasReportMatch = compareGasReportRegex.exec(compareFileContents)) !== null) {
-          const source = compareGasReportMatch[1];
-          const name = compareGasReportMatch[2];
-          const functionCall = compareGasReportMatch[3];
-          const gasUsed = compareGasReportMatch[4];
-
-          compareGasReport.push({ source, name, functionCall, gasUsed: parseInt(gasUsed) });
-        }
+        const compareGasReport: GasReport = JSON.parse(readFileSync(compare, "utf8"));
+        // Merge the previous gas report with the new one
+        gasReport = gasReport.map((entry) => {
+          const prevEntry = compareGasReport.find(
+            (e) => e.name === entry.name && e.functionCall === entry.functionCall
+          );
+          return { ...entry, prevGasUsed: prevEntry?.gasUsed };
+        });
       } catch {
         console.log(chalk.red(`Gas report to compare not found: ${compare}`));
         compare = undefined;
       }
     }
 
-    // Merge the previous gas report with the new one
-    gasReport = gasReport.map((entry) => {
-      const prevEntry = compareGasReport.find((e) => e.name === entry.name && e.functionCall === entry.functionCall);
-      return { ...entry, prevGasUsed: prevEntry?.gasUsed };
-    });
-
     // Print gas report
     printGasReport(gasReport, compare);
 
@@ -101,16 +103,11 @@ const commandModule: CommandModule<Options, Options> = {
 
 export default commandModule;
 
-async function runGasReport(path: string): Promise<GasReport> {
-  if (!path.endsWith(".t.sol")) {
-    console.log("Skipping gas report for", chalk.bold(path), "(not a test file)");
-    return [];
-  }
-  console.log("Running gas report for", chalk.bold(path));
-  const gasReport: GasReport = [];
+async function createGasReport(filename: string): Promise<string> {
+  console.log("Creating gas report for", chalk.bold(filename));
 
   // Parse the given test file, and add gas reporting wherever requested by a `// !gasreport` comment
-  const fileContents = readFileSync(path, "utf8");
+  const fileContents = readFileSync(filename, "utf8");
   let newFile = fileContents;
 
   // Use a regex to find first line of each function
@@ -139,7 +136,7 @@ async function runGasReport(path: string): Promise<GasReport> {
 _gasreport = gasleft();
 ${functionCall}
 _gasreport = _gasreport - gasleft();
-console.log("GAS REPORT: ${name} [${functionCall.replaceAll('"', '\\"')}]:", _gasreport);`
+console.log("GAS REPORT(${filename}): ${name} [${functionCall.replaceAll('"', '\\"')}]:", _gasreport);`
     );
   }
 
@@ -148,41 +145,47 @@ console.log("GAS REPORT: ${name} [${functionCall.replaceAll('"', '\\"')}]:", _ga
 
   // Write the new file to disk (temporarily)
   // Create the temp file by replacing the previous file name with MudGasReport
-  const tempFileName = path.replace(/\.t\.sol$/, "MudGasReport.t.sol");
+  const tempFileName = filename.replace(/\.t\.sol$/, `${tempFileSuffix}.t.sol`);
   writeFileSync(tempFileName, newFile);
 
-  // Run the generated file using forge
-  const child = execa("forge", ["test", "--match-path", tempFileName, "-vvv"], {
-    stdio: ["inherit", "pipe", "inherit"],
-  });
+  return tempFileName;
+}
+
+async function runGasReport(): Promise<GasReport> {
+  console.log("Running gas report");
+  const gasReport: GasReport = [];
 
   // Extract the logs from the child process
   let logs = "";
   try {
+    // Run the generated file using forge
+    const child = execa("forge", ["test", "--match-path", `*${tempFileSuffix}*`, "-vvv"], {
+      stdio: ["inherit", "pipe", "inherit"],
+    });
     logs = (await child).stdout;
-    rmSync(tempFileName);
-  } catch (e: any) {
-    console.log(e.stdout ?? e);
+  } catch (error: any) {
+    console.log(error.stdout ?? error);
     console.log(chalk.red("\n-----------\nError while running the gas report (see above)"));
-    rmSync(tempFileName);
-    process.exit();
+    throw error;
   }
 
   // Extract the gas reports from the logs
 
   // Create a regex to find all lines starting with `GAS REPORT:` and extract the name, function call and gas used
-  const gasReportRegex = new RegExp(/GAS REPORT: (.*) \[(.*)\]: (.*)/g);
+  const gasReportRegex = new RegExp(/GAS REPORT\((.*)\): (.*) \[(.*)\]: (.*)/g);
 
   // Loop through the matches and print the gas report
   let gasReportMatch;
   while ((gasReportMatch = gasReportRegex.exec(logs)) !== null) {
-    const name = gasReportMatch[1];
-    const functionCall = gasReportMatch[2].replace(";", "");
-    const gasUsed = gasReportMatch[3];
-
-    gasReport.push({ source: path, name, functionCall, gasUsed: parseInt(gasUsed) });
+    const source = gasReportMatch[1];
+    const name = gasReportMatch[2];
+    const functionCall = gasReportMatch[3].replace(";", "");
+    const gasUsed = parseInt(gasReportMatch[4]);
+    gasReport.push({ source, name, functionCall, gasUsed });
   }
 
+  gasReport.sort((a, b) => a.source.localeCompare(b.source));
+
   return gasReport;
 }
 
@@ -212,9 +215,5 @@ function printGasReport(gasReport: GasReport, compare?: string) {
 
 function saveGasReport(gasReport: GasReport, path: string) {
   console.log(chalk.bold(`Saving gas report to ${path}`));
-  const serializedGasReport = gasReport
-    .map((entry) => `(${entry.source}) | ${entry.name} [${entry.functionCall}]: ${entry.gasUsed}`)
-    .join("\n");
-
-  writeFileSync(path, serializedGasReport);
+  writeFileSync(path, `${JSON.stringify(gasReport, null, 2)}\n`);
 }

package/src/commands/index.ts

@@ -1,14 +1,5 @@
 import { CommandModule } from "yargs";
 
-import bulkupload from "./deprecated/bulkupload.js";
-import callSystem from "./deprecated/call-system.js";
-import codegenLibdeploy from "./deprecated/codegen-libdeploy.js";
-import deployContracts from "./deprecated/deploy-contracts.js";
-import systemTypes from "./deprecated/system-types.js";
-import test from "./deprecated/test.js";
-import trace from "./deprecated/trace.js";
-import types from "./deprecated/types.js";
-
 import devnode from "./devnode.js";
 import faucet from "./faucet.js";
 import gasReport from "./gas-report.js";
@@ -18,24 +9,18 @@ import tsgen from "./tsgen.js";
 import deployV2 from "./deploy-v2.js";
 import worldgen from "./worldgen.js";
 import setVersion from "./set-version.js";
+import testV2 from "./test-v2.js";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Each command has different options
 export const commands: CommandModule<any, any>[] = [
-  bulkupload,
-  callSystem,
-  codegenLibdeploy,
-  deployContracts,
   deployV2,
   devnode,
   faucet,
   gasReport,
   hello,
-  systemTypes,
   tablegen,
   tsgen,
-  test,
-  trace,
-  types,
   worldgen,
   setVersion,
+  testV2,
 ];

package/src/commands/set-version.ts

@@ -2,14 +2,16 @@ import chalk from "chalk";
 import { existsSync, readFileSync, rmSync, writeFileSync } from "fs";
 import path from "path";
 import type { CommandModule } from "yargs";
-import { logError, MUDError } from "../utils/errors.js";
-import localPackageJson from "../../package.json";
+import { MUDError } from "@latticexyz/config";
+import { logError } from "../utils/errors.js";
+import localPackageJson from "../../package.json" assert { type: "json" };
 
 type Options = {
   backup?: boolean;
   force?: boolean;
   restore?: boolean;
   mudVersion?: string;
+  link?: string;
 };
 
 const BACKUP_FILE = ".mudbackup";
@@ -29,13 +31,19 @@ const commandModule: CommandModule<Options, Options> = {
       },
       restore: { type: "boolean", description: `Restore the previous MUD versions from "${BACKUP_FILE}"` },
       mudVersion: { alias: "v", type: "string", description: "The MUD version to install" },
+      link: { alias: "l", type: "string", description: "Relative path to the local MUD root directory to link" },
     });
   },
 
   async handler(options) {
     try {
-      if (!options.mudVersion && !options.restore) {
-        throw new MUDError(`Version parameter is required unless --restore is provided.`);
+      if (!options.mudVersion && !options.link && !options.restore) {
+        throw new MUDError("`--mudVersion` or `--link` is required unless --restore is provided.");
+      }
+
+      // `link` and `mudVersion` are mutually exclusive
+      if (options.link && options.mudVersion) {
+        throw new MUDError("Options `--link` and `--mudVersion` are mutually exclusive");
       }
 
       // Resolve the `canary` version number if needed
@@ -62,11 +70,17 @@ const commandModule: CommandModule<Options, Options> = {
 };
 
 function updatePackageJson(filePath: string, options: Options): { workspaces?: string[] } {
-  const { backup, restore, force, mudVersion } = options;
+  const { restore, force, link } = options;
+  let { backup, mudVersion } = options;
+
   const backupFilePath = path.join(path.dirname(filePath), BACKUP_FILE);
+  const backupFileExists = existsSync(backupFilePath);
+
+  // Create a backup file for previous MUD versions by default if linking to local MUD
+  if (link && !backupFileExists) backup = true;
 
   // If `backup` is true and force not set, check if a backup file already exists and throw an error if it does
-  if (backup && !force && existsSync(backupFilePath)) {
+  if (backup && !force && backupFileExists) {
     throw new MUDError(
       `A backup file already exists at ${backupFilePath}.\nUse --force to overwrite it or --restore to restore it.`
     );
@@ -105,16 +119,14 @@ function updatePackageJson(filePath: string, options: Options): { workspaces?: s
   // Update the dependencies
   for (const key in packageJson.dependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.dependencies[key] =
-        restore && backupJson ? backupJson.dependencies[key] : mudVersion || packageJson.dependencies[key];
+      packageJson.dependencies[key] = resolveMudVersion(key, "dependencies");
     }
   }
 
   // Update the devDependencies
   for (const key in packageJson.devDependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.devDependencies[key] =
-        restore && backupJson ? backupJson.devDependencies[key] : mudVersion || packageJson.devDependencies[key];
+      packageJson.devDependencies[key] = resolveMudVersion(key, "devDependencies");
     }
   }
 
@@ -133,6 +145,13 @@ function updatePackageJson(filePath: string, options: Options): { workspaces?: s
   }
 
   return packageJson;
+
+  function resolveMudVersion(key: string, type: "dependencies" | "devDependencies") {
+    if (restore && backupJson) return backupJson[type][key];
+    if (link) mudVersion = resolveLinkPath(filePath, link, key);
+    if (!mudVersion) return packageJson[type][key];
+    return mudVersion;
+  }
 }
 
 function readPackageJson(path: string): {
@@ -168,4 +187,14 @@ function logComparison(prev: Record<string, string>, curr: Record<string, string
   }
 }
 
+/**
+ * Returns path of the package to link, given a path to a local MUD clone and a package
+ */
+function resolveLinkPath(packageJsonPath: string, mudLinkPath: string, pkg: string) {
+  const pkgName = pkg.replace(MUD_PREFIX, "");
+  const packageJsonToRootPath = path.relative(path.dirname(packageJsonPath), process.cwd());
+  const linkPath = path.join(packageJsonToRootPath, mudLinkPath, "packages", pkgName);
+  return "link:" + linkPath;
+}
+
 export default commandModule;

package/src/commands/tablegen.ts

@@ -1,7 +1,8 @@
+import path from "path";
 import type { CommandModule } from "yargs";
-import { loadStoreConfig } from "../config/loadStoreConfig.js";
-import { getSrcDirectory } from "../utils/foundry.js";
+import { loadStoreConfig } from "@latticexyz/config";
 import { tablegen } from "../render-solidity/tablegen.js";
+import { getSrcDirectory } from "../utils/index.js";
 
 type Options = {
   configPath?: string;
@@ -19,11 +20,10 @@ const commandModule: CommandModule<Options, Options> = {
   },
 
   async handler({ configPath }) {
-    const srcDirectory = await getSrcDirectory();
-
     const config = await loadStoreConfig(configPath);
+    const srcDir = await getSrcDirectory();
 
-    await tablegen(config, srcDirectory);
+    await tablegen(config, path.join(srcDir, config.codegenDirectory));
 
     process.exit(0);
   },

package/src/commands/test-v2.ts

@@ -0,0 +1,71 @@
+import type { CommandModule } from "yargs";
+import { deployHandler, DeployOptions } from "./deploy-v2.js";
+import { yDeployOptions } from "./deploy-v2.js";
+import { anvil, forge, getRpcUrl, getTestDirectory } from "../utils/foundry.js";
+import chalk from "chalk";
+import { rmSync, writeFileSync } from "fs";
+import path from "path";
+
+type Options = DeployOptions & { port?: number; worldAddress?: string; forgeOptions?: string };
+
+const WORLD_ADDRESS_FILE = ".mudtest";
+
+const commandModule: CommandModule<Options, Options> = {
+  command: "test-v2",
+
+  describe: "Run tests in MUD v2 contracts",
+
+  builder(yargs) {
+    return yargs.options({
+      ...yDeployOptions,
+      port: { type: "number", description: "Port to run internal node for fork testing on", default: 4242 },
+      worldAddress: {
+        type: "string",
+        description:
+          "Address of an existing world contract. If provided, deployment is skipped and the RPC provided in the foundry.toml is used for fork testing.",
+      },
+      forgeOptions: { type: "string", description: "Options to pass to forge test" },
+    });
+  },
+
+  async handler(args) {
+    // Start an internal anvil process if no world address is provided
+    if (!args.worldAddress) {
+      const anvilArgs = ["--block-base-fee-per-gas", "0", "--port", String(args.port)];
+      anvil(anvilArgs);
+    }
+
+    const forkRpc = args.worldAddress ? await getRpcUrl(args.profile) : `http://127.0.0.1:${args.port}`;
+
+    const worldAddress =
+      args.worldAddress ??
+      (
+        await deployHandler({
+          ...args,
+          saveDeployment: false,
+          rpc: forkRpc,
+        })
+      ).worldAddress;
+
+    console.log(chalk.blue("World address", worldAddress));
+
+    // Create a temporary file to pass the world address to the tests
+    writeFileSync(WORLD_ADDRESS_FILE, worldAddress);
+
+    const userOptions = args.forgeOptions?.replaceAll("\\", "").split(" ") ?? [];
+    try {
+      const testResult = await forge(["test", "--fork-url", forkRpc, ...userOptions], {
+        profile: args.profile,
+      });
+      console.log(testResult);
+    } catch (e) {
+      console.error(e);
+    }
+
+    rmSync(WORLD_ADDRESS_FILE);
+
+    process.exit(0);
+  },
+};
+
+export default commandModule;

package/src/commands/tsgen.ts

@@ -1,5 +1,5 @@
 import type { CommandModule } from "yargs";
-import { loadStoreConfig } from "../config/loadStoreConfig.js";
+import { loadStoreConfig } from "@latticexyz/config";
 import { tsgen } from "../render-ts/tsgen.js";
 
 type Options = {

package/src/commands/worldgen.ts

@@ -1,6 +1,5 @@
 import type { CommandModule } from "yargs";
-import { loadStoreConfig } from "../config/loadStoreConfig.js";
-import { loadWorldConfig } from "../config/index.js";
+import { loadStoreConfig, loadWorldConfig } from "@latticexyz/config";
 import { getSrcDirectory } from "../utils/foundry.js";
 import glob from "glob";
 import path, { basename } from "path";
@@ -42,11 +41,13 @@ const commandModule: CommandModule<Options, Options> = {
     const storeConfig = await loadStoreConfig(configPath);
     const mudConfig = { ...worldConfig, ...storeConfig };
 
+    const outputBaseDirectory = path.join(srcDir, mudConfig.codegenDirectory);
+
     // clear the worldgen directory
-    if (clean) rmSync(path.join(srcDir, worldConfig.worldgenDirectory), { recursive: true, force: true });
+    if (clean) rmSync(path.join(outputBaseDirectory, mudConfig.worldgenDirectory), { recursive: true, force: true });
 
     // generate new interfaces
-    await worldgen(mudConfig, existingContracts, srcDir);
+    await worldgen(mudConfig, existingContracts, outputBaseDirectory);
 
     process.exit(0);
   },

package/src/contracts/BulkUpload.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-import {Script} from "forge-std/Script.sol";
-import {console} from "forge-std/console.sol";
+import { Script } from "forge-std/Script.sol";
+import { console } from "forge-std/console.sol";
 
-import {BulkSetStateSystem, ID as BulkSetStateSystemID, ECSEvent} from "std-contracts/systems/BulkSetStateSystem.sol";
-import {World} from "solecs/World.sol";
-import {System} from "solecs/System.sol";
-import {getAddressById} from "solecs/utils.sol";
-import {Set} from "solecs/Set.sol";
+import { BulkSetStateSystem, ID as BulkSetStateSystemID, ECSEvent } from "std-contracts/systems/BulkSetStateSystem.sol";
+import { World } from "solecs/World.sol";
+import { System } from "solecs/System.sol";
+import { getAddressById } from "solecs/utils.sol";
+import { Set } from "solecs/Set.sol";
 
 struct ParsedState {
   string[] componentIds;
@@ -33,11 +33,7 @@ struct State {
  * forge script --sig "run(string, address)" --rpc-url http://localhost:8545 src/contracts/BulkUpload.sol:BulkUpload path/to/ecs-map-test.json <WORLD_ADDRESS>
  */
 contract BulkUpload is Script {
-  function run(
-    string memory path,
-    address worldAddress,
-    uint256 eventsPerTx
-  ) public {
+  function run(string memory path, address worldAddress, uint256 eventsPerTx) public {
     vmSafe.startBroadcast();
 
     // Read JSON
@@ -108,9 +104,10 @@ contract BulkUpload is Script {
   }
 }
 
-function transformEventsToOnlyUseNeededEntities(uint256[] memory entities, ECSEvent[] memory events)
-  returns (uint256[] memory, ECSEvent[] memory)
-{
+function transformEventsToOnlyUseNeededEntities(
+  uint256[] memory entities,
+  ECSEvent[] memory events
+) returns (uint256[] memory, ECSEvent[] memory) {
   Set uniqueEntityIndices = new Set();
 
   // Find unique entity indices
@@ -167,11 +164,7 @@ function hexToBytes(string memory s) pure returns (bytes memory) {
   return r;
 }
 
-function substring(
-  string memory str,
-  uint256 start,
-  uint256 end
-) pure returns (string memory) {
+function substring(string memory str, uint256 start, uint256 end) pure returns (string memory) {
   bytes memory strBytes = bytes(str);
   bytes memory result = new bytes(end - start);
   for (uint256 i = start; i < end; i++) {

package/src/contracts/Deploy.sol

@@ -2,11 +2,11 @@
 pragma solidity >=0.8.0;
 
 // Foundry
-import {Script} from "forge-std/Script.sol";
-import {console} from "forge-std/console.sol";
+import { Script } from "forge-std/Script.sol";
+import { console } from "forge-std/console.sol";
 
 // Libraries
-import {LibDeploy, DeployResult} from "./LibDeploy.sol";
+import { LibDeploy, DeployResult } from "./LibDeploy.sol";
 
 contract Deploy is Script {
   function broadcastDeploy(

package/src/contracts/LibDeploy.sol

@@ -7,7 +7,7 @@ pragma solidity >=0.8.0;
 //        To manually generate the real LibDeploy.sol use
 //        `mud codegen-libdeploy`.
 
-import {IWorld} from "solecs/interfaces/IWorld.sol";
+import { IWorld } from "solecs/interfaces/IWorld.sol";
 
 struct DeployResult {
   IWorld world;

package/src/contracts/LibDeployStub.sol

@@ -7,7 +7,7 @@ pragma solidity >=0.8.0;
 //        To manually generate the real LibDeploy.sol use
 //        `mud codegen-libdeploy`.
 
-import {IWorld} from "solecs/interfaces/IWorld.sol";
+import { IWorld } from "solecs/interfaces/IWorld.sol";
 
 struct DeployResult {
   IWorld world;

package/src/index.ts

@@ -1,15 +1 @@
-export { loadStoreConfig } from "./config/loadStoreConfig.js";
-export { parseStoreConfig } from "./config/parseStoreConfig.js";
-export { loadWorldConfig, resolveWorldConfig, parseWorldConfig } from "./config/world/index.js";
-export { resolveTableId } from "./config/dynamicResolution.js";
-
-export type {
-  StoreUserConfig,
-  StoreConfig,
-  WorldUserConfig,
-  ResolvedWorldConfig,
-  MUDUserConfig,
-  MUDConfig,
-} from "./config/index.js";
-
-export { storeConfig, mudConfig } from "./config/index.js";
+export {};

package/src/mud.ts

@@ -1,8 +1,9 @@
-#!/usr/bin/env -S TS_NODE_COMPILER_OPTIONS={\"module\":\"esnext\"} node --loader=ts-node/esm --no-warnings
+#!/usr/bin/env node
 
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { commands } from "./commands/index.js";
+import { commands as v2 } from "./commands/index.js";
+import { commands as v1 } from "./commands/deprecated/index.js";
 import { logError } from "./utils/errors.js";
 
 // Load .env file into process.env
@@ -14,7 +15,7 @@ yargs(hideBin(process.argv))
   .scriptName("mud")
   // Use the commands directory to scaffold
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- command array overload isn't typed, see https://github.com/yargs/yargs/blob/main/docs/advanced.md#esm-hierarchy
-  .command(commands as any)
+  .command([...v1, ...v2] as any)
   // Enable strict mode.
   .strict()
   // Custom error handler

package/src/mud2.ts

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { commands } from "./commands/index.js";
+import { logError } from "./utils/errors.js";
+
+// Load .env file into process.env
+import * as dotenv from "dotenv";
+dotenv.config();
+
+yargs(hideBin(process.argv))
+  // Explicit name to display in help (by default it's the entry file, which may not be "mud" for e.g. ts-node)
+  .scriptName("mud")
+  // Use the commands directory to scaffold
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- command array overload isn't typed, see https://github.com/yargs/yargs/blob/main/docs/advanced.md#esm-hierarchy
+  .command(commands as any)
+  // Enable strict mode.
+  .strict()
+  // Custom error handler
+  .fail((msg, err) => {
+    console.log("");
+    logError(err);
+    console.log("");
+
+    process.exit(1);
+  })
+  // Useful aliases.
+  .alias({ h: "help" }).argv;

package/src/render-solidity/common.ts

@@ -27,7 +27,7 @@ export function renderCommonData({
 }: Pick<RenderTableOptions, "staticResourceData" | "primaryKeys">) {
   // static resource means static tableId as well, and no tableId arguments
   const _tableId = staticResourceData ? "" : "_tableId";
-  const _typedTableId = staticResourceData ? "" : "uint256 _tableId";
+  const _typedTableId = staticResourceData ? "" : "bytes32 _tableId";
 
   const _keyArgs = renderArguments(primaryKeys.map(({ name }) => name));
   const _typedKeyArgs = renderArguments(primaryKeys.map(({ name, typeWithLocation }) => `${typeWithLocation} ${name}`));
@@ -100,11 +100,11 @@ export function renderWithStore(
 }
 
 export function renderTableId(staticResourceData: StaticResourceData) {
-  const hardcodedTableId = `uint256(bytes32(abi.encodePacked(bytes16("${staticResourceData.namespace}"), bytes16("${staticResourceData.fileSelector}"))))`;
+  const hardcodedTableId = `bytes32(abi.encodePacked(bytes16("${staticResourceData.namespace}"), bytes16("${staticResourceData.name}")))`;
 
   const tableIdDefinition = `
-    uint256 constant _tableId = ${hardcodedTableId};
-    uint256 constant ${staticResourceData.tableIdName} = _tableId;
+    bytes32 constant _tableId = ${hardcodedTableId};
+    bytes32 constant ${staticResourceData.tableIdName} = _tableId;
   `;
   return {
     hardcodedTableId,