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

package/dist/config/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RequireKeys, b as StringForUnion, E as ExtractUserTypes, S as StoreUserConfig, a as StoreConfig } from '../parseStoreConfig-05533795.js';
-export { h as EnumsConfig, F as FullSchemaConfig, d as SchemaConfig, c as ShorthandSchemaConfig, a as StoreConfig, S as StoreUserConfig, T as TableConfig, f as TablesConfig, p as parseStoreConfig, s as storeConfig, i as zEnumsConfig, z as zSchemaConfig, j as zStoreConfig, e as zTableConfig, g as zTablesConfig } from '../parseStoreConfig-05533795.js';
+import { R as RequireKeys, b as StringForUnion, E as ExtractUserTypes, S as StoreUserConfig, a as StoreConfig } from '../parseStoreConfig-8aa69ac9.js';
+export { h as EnumsConfig, F as FullSchemaConfig, d as SchemaConfig, c as ShorthandSchemaConfig, a as StoreConfig, S as StoreUserConfig, T as TableConfig, f as TablesConfig, p as parseStoreConfig, s as storeConfig, i as zEnumsConfig, z as zSchemaConfig, j as zStoreConfig, e as zTableConfig, g as zTablesConfig } from '../parseStoreConfig-8aa69ac9.js';
 import { z, RefinementCtx } from 'zod';
 import '@latticexyz/schema-type';
 
@@ -17,6 +17,7 @@ declare function loadStoreConfig(configPath?: string): Promise<{
     namespace: string;
     storeImportPath: string;
     userTypesPath: string;
+    codegenDirectory: string;
 }>;
 
 type SystemUserConfig = {

package/dist/config/index.js

@@ -27,7 +27,7 @@ import {
   zUserEnum,
   zValueName,
   zWorldConfig
-} from "../chunk-S7JI7355.js";
+} from "../chunk-MN3HYFJK.js";
 import {
   getDuplicates,
   parseStaticArray,

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { MUDConfig, MUDUserConfig, ResolvedWorldConfig, WorldUserConfig, loadStoreConfig, loadWorldConfig, mudConfig, parseWorldConfig, resolveTableId, resolveWorldConfig } from './config/index.js';
-export { a as StoreConfig, S as StoreUserConfig, p as parseStoreConfig, s as storeConfig } from './parseStoreConfig-05533795.js';
+export { a as StoreConfig, S as StoreUserConfig, p as parseStoreConfig, s as storeConfig } from './parseStoreConfig-8aa69ac9.js';
 import 'zod';
 import '@latticexyz/schema-type';

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   resolveTableId,
   resolveWorldConfig,
   storeConfig
-} from "./chunk-S7JI7355.js";
+} from "./chunk-MN3HYFJK.js";
 import "./chunk-KPBNUPK6.js";
 import "./chunk-O6HOO6WA.js";
 export {

package/dist/mud.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   commands
-} from "./chunk-2L44HXDV.js";
-import "./chunk-QGY6YXME.js";
+} from "./chunk-TLEAEDUA.js";
+import "./chunk-XUNWAEP7.js";
 import {
   logError
-} from "./chunk-S7JI7355.js";
+} from "./chunk-MN3HYFJK.js";
 import {
   JsonRpcProvider,
   componentsDir,
@@ -24,7 +24,7 @@ import {
   getSrcDirectory,
   getTestDirectory
 } from "./chunk-FPG73MVN.js";
-import "./chunk-MIGVHECZ.js";
+import "./chunk-DO7OWTMM.js";
 import "./chunk-TPZUS44H.js";
 import "./chunk-5NC2OON2.js";
 import "./chunk-KPBNUPK6.js";

package/dist/mud2.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   commands
-} from "./chunk-2L44HXDV.js";
-import "./chunk-QGY6YXME.js";
+} from "./chunk-TLEAEDUA.js";
+import "./chunk-XUNWAEP7.js";
 import {
   logError
-} from "./chunk-S7JI7355.js";
+} from "./chunk-MN3HYFJK.js";
 import "./chunk-FFY7VTYB.js";
 import "./chunk-FPG73MVN.js";
-import "./chunk-MIGVHECZ.js";
+import "./chunk-DO7OWTMM.js";
 import "./chunk-TPZUS44H.js";
 import "./chunk-5NC2OON2.js";
 import "./chunk-KPBNUPK6.js";

package/dist/{parseStoreConfig-05533795.d.ts → parseStoreConfig-8aa69ac9.d.ts}

@@ -219,6 +219,8 @@ type StoreUserConfig<EnumNames extends StringForUnion = StringForUnion, StaticUs
     tables: TablesConfig<AsDependent<StaticUserTypes>, AsDependent<StaticUserTypes>>;
     /** Path to the file where common user types will be generated and imported from. Default is "Types" */
     userTypesPath?: string;
+    /** Path to the directory where generated files will be placed. (Default is "codegen") */
+    codegenDirectory?: string;
 };
 /** Type helper for defining StoreUserConfig */
 declare function storeConfig<EnumNames extends StringForUnion = never, StaticUserTypes extends ExtractUserTypes<EnumNames> = ExtractUserTypes<EnumNames>>(config: StoreUserConfig<EnumNames, StaticUserTypes>): StoreUserConfig<EnumNames, StaticUserTypes>;
@@ -292,6 +294,7 @@ declare const zStoreConfig: z.ZodEffects<z.ZodObject<{
     namespace: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
     storeImportPath: z.ZodDefault<z.ZodString>;
     userTypesPath: z.ZodDefault<z.ZodString>;
+    codegenDirectory: z.ZodDefault<z.ZodString>;
     enums: z.ZodDefault<z.ZodRecord<z.ZodEffects<z.ZodString, string, string>, z.ZodEffects<z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">, string[], string[]>>>;
 }, "strip", z.ZodTypeAny, {
     tables: Record<string, RequireKeys<RequireKeys<{
@@ -307,6 +310,7 @@ declare const zStoreConfig: z.ZodEffects<z.ZodObject<{
     namespace: string;
     storeImportPath: string;
     userTypesPath: string;
+    codegenDirectory: string;
 }, {
     tables: Record<string, string | {
         schema: (string | Record<string, string>) & (string | Record<string, string> | undefined);
@@ -320,6 +324,7 @@ declare const zStoreConfig: z.ZodEffects<z.ZodObject<{
     namespace?: string | undefined;
     storeImportPath?: string | undefined;
     userTypesPath?: string | undefined;
+    codegenDirectory?: string | undefined;
     enums?: Record<string, string[]> | undefined;
 }>, {
     tables: Record<string, RequireKeys<RequireKeys<{
@@ -335,6 +340,7 @@ declare const zStoreConfig: z.ZodEffects<z.ZodObject<{
     namespace: string;
     storeImportPath: string;
     userTypesPath: string;
+    codegenDirectory: string;
 }, {
     tables: Record<string, string | {
         schema: (string | Record<string, string>) & (string | Record<string, string> | undefined);
@@ -348,6 +354,7 @@ declare const zStoreConfig: z.ZodEffects<z.ZodObject<{
     namespace?: string | undefined;
     storeImportPath?: string | undefined;
     userTypesPath?: string | undefined;
+    codegenDirectory?: string | undefined;
     enums?: Record<string, string[]> | undefined;
 }>;
 declare function parseStoreConfig(config: unknown): {
@@ -364,6 +371,7 @@ declare function parseStoreConfig(config: unknown): {
     namespace: string;
     storeImportPath: string;
     userTypesPath: string;
+    codegenDirectory: string;
 };
 
 export { ExtractUserTypes as E, FullSchemaConfig as F, RequireKeys as R, StoreUserConfig as S, TableConfig as T, StoreConfig as a, StringForUnion as b, ShorthandSchemaConfig as c, SchemaConfig as d, zTableConfig as e, TablesConfig as f, zTablesConfig as g, EnumsConfig as h, zEnumsConfig as i, zStoreConfig as j, parseStoreConfig as p, storeConfig as s, zSchemaConfig as z };

package/dist/render-solidity/index.d.ts

@@ -1,4 +1,4 @@
-import { a as StoreConfig } from '../parseStoreConfig-05533795.js';
+import { a as StoreConfig } from '../parseStoreConfig-8aa69ac9.js';
 import { SchemaType } from '@latticexyz/schema-type';
 import 'zod';
 

package/dist/render-solidity/index.js

@@ -16,7 +16,7 @@ import {
   renderedSolidityHeader,
   solidityRelativeImportPath,
   tablegen
-} from "../chunk-MIGVHECZ.js";
+} from "../chunk-DO7OWTMM.js";
 import {
   getSchemaTypeInfo,
   getUserTypeInfo,

package/dist/render-ts/index.d.ts

@@ -1,4 +1,4 @@
-import { a as StoreConfig } from '../parseStoreConfig-05533795.js';
+import { a as StoreConfig } from '../parseStoreConfig-8aa69ac9.js';
 import { SchemaType } from '@latticexyz/schema-type';
 import 'zod';
 

package/dist/utils/index.d.ts

@@ -1,7 +1,7 @@
 import { ZodError, z } from 'zod';
 import { ValidationError } from 'zod-validation-error';
 import { MUDConfig } from '../config/index.js';
-import '../parseStoreConfig-05533795.js';
+import '../parseStoreConfig-8aa69ac9.js';
 import '@latticexyz/schema-type';
 
 declare function fromZodErrorCustom(error: ZodError, prefix: string): ValidationError;

package/dist/utils/index.js

@@ -1,13 +1,13 @@
 import {
   deploy
-} from "../chunk-QGY6YXME.js";
+} from "../chunk-XUNWAEP7.js";
 import {
   MUDError,
   NotInsideProjectError,
   UnrecognizedSystemErrorFactory,
   fromZodErrorCustom,
   logError
-} from "../chunk-S7JI7355.js";
+} from "../chunk-MN3HYFJK.js";
 import {
   anvil,
   cast,

package/package.json

@@ -1,6 +1,6 @@
 {
   "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",
@@ -27,7 +27,7 @@
     "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",
@@ -40,10 +40,10 @@
   "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",
@@ -70,5 +70,5 @@
     "zod": "^3.21.4",
     "zod-validation-error": "^1.0.1"
   },
-  "gitHead": "406a002d58cbdb3f65af5bb47a2c7791ac93d5f2"
+  "gitHead": "cf5f4bfe0d1d14e70efbf10ebef47d39f39e7239"
 }

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 { 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/worldgen.ts

@@ -42,11 +42,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/config/parseStoreConfig.ts

@@ -192,6 +192,8 @@ export type StoreUserConfig<
   tables: TablesConfig<AsDependent<StaticUserTypes>, AsDependent<StaticUserTypes>>;
   /** Path to the file where common user types will be generated and imported from. Default is "Types" */
   userTypesPath?: string;
+  /** Path to the directory where generated files will be placed. (Default is "codegen") */
+  codegenDirectory?: string;
 };
 
 /** Type helper for defining StoreUserConfig */
@@ -211,6 +213,7 @@ const StoreConfigUnrefined = z
     storeImportPath: z.string().default("@latticexyz/store/src/"),
     tables: zTablesConfig,
     userTypesPath: z.string().default("Types"),
+    codegenDirectory: z.string().default("codegen"),
   })
   .merge(zEnumsConfig);
 

package/src/render-solidity/renderTableIndex.ts

@@ -0,0 +1,15 @@
+import { renderList, renderedSolidityHeader } from "./common.js";
+import { TableOptions } from "./tableOptions.js";
+
+export function renderTableIndex(options: TableOptions[]) {
+  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}";`;
+})}
+`;
+}

package/src/render-solidity/tablegen.ts

@@ -4,9 +4,17 @@ import { getTableOptions } from "./tableOptions.js";
 import { renderTable } from "./renderTable.js";
 import { renderTypesFromConfig } from "./renderTypesFromConfig.js";
 import { formatAndWriteSolidity } from "../utils/formatAndWrite.js";
+import { renderTableIndex } from "./renderTableIndex.js";
+import { rmSync } from "fs";
 
 export async function tablegen(config: StoreConfig, outputBaseDirectory: string) {
   const allTableOptions = getTableOptions(config);
+
+  const uniqueTableDirectories = new Set(allTableOptions.map(({ outputPath }) => path.dirname(outputPath)));
+  for (const tableDir of uniqueTableDirectories) {
+    rmSync(path.join(outputBaseDirectory, tableDir), { recursive: true, force: true });
+  }
+
   // write tables to files
   for (const { outputPath, renderOptions } of allTableOptions) {
     const fullOutputPath = path.join(outputBaseDirectory, outputPath);
@@ -20,4 +28,8 @@ export async function tablegen(config: StoreConfig, outputBaseDirectory: string)
     const output = renderTypesFromConfig(config);
     formatAndWriteSolidity(output, fullOutputPath, "Generated types file");
   }
+
+  const fullOutputPath = path.join(outputBaseDirectory, `Tables.sol`);
+  const output = renderTableIndex(allTableOptions);
+  formatAndWriteSolidity(output, fullOutputPath, "Generated table index");
 }