@latticexyz/cli 1.41.1-alpha.41 → 1.42.0

package/dist/mud2.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/mud2.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+import {
+  commands
+} from "./chunk-7KQJTK2K.js";
+import {
+  logError
+} from "./chunk-4STWSICF.js";
+import "./chunk-VQTZJIFF.js";
+import "./chunk-FPG73MVN.js";
+import "./chunk-WZFXLDPK.js";
+import "./chunk-6V563IAZ.js";
+import "./chunk-SKNB74MT.js";
+import "./chunk-L4YLJHLJ.js";
+
+// src/mud2.ts
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import * as dotenv from "dotenv";
+dotenv.config();
+yargs(hideBin(process.argv)).scriptName("mud").command(commands).strict().fail((msg, err) => {
+  console.log("");
+  logError(err);
+  console.log("");
+  process.exit(1);
+}).alias({ h: "help" }).argv;

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

@@ -0,0 +1,171 @@
+import { StoreConfig } from '@latticexyz/config';
+import { SchemaType } from '@latticexyz/schema-type';
+
+interface RenderTableOptions {
+    /** List of symbols to import, and their file paths */
+    imports: ImportDatum[];
+    /** Name of the library to render. */
+    libraryName: string;
+    /** Name of the struct to render. If undefined, struct and its methods aren't rendered. */
+    structName?: string;
+    /** Data used to statically registed the table. If undefined, all methods receive `_tableId` as an argument. */
+    staticResourceData?: StaticResourceData;
+    /** Path for store package imports */
+    storeImportPath: string;
+    primaryKeys: RenderTablePrimaryKey[];
+    fields: RenderTableField[];
+    staticFields: RenderTableStaticField[];
+    dynamicFields: RenderTableDynamicField[];
+    /** Whether to render get/set methods for the whole record */
+    withRecordMethods: boolean;
+    /** Whether to render additional methods that accept a manual `IStore` argument */
+    storeArgument: boolean;
+}
+interface ImportDatum {
+    symbol: string;
+    fromPath: string;
+    usedInPath: string;
+}
+interface StaticResourceData {
+    /** Name of the table id constant to render. */
+    tableIdName: string;
+    namespace: string;
+    name: string;
+}
+interface RenderTableType {
+    typeId: string;
+    typeWithLocation: string;
+    /** The name of the enum element in SchemaType to use for schema registration (e.g. "UINT256_ARRAY") */
+    enumName: string;
+    staticByteLength: number;
+    isDynamic: boolean;
+    /** Empty for internal types. Custom `wrap` method for user defined types. */
+    typeWrap: string;
+    /** Empty for internal types. Custom `unwrap` method for user defined types. */
+    typeUnwrap: string;
+    /** Data to generate the custom wrapper and unwrapper if necessary. */
+    typeWrappingData?: RenderTableTypeWrappingData;
+    /** Same as typeId for internal types. The underlying `typeId` for user defined types. */
+    internalTypeId: string;
+}
+type RenderTableTypeWrappingData = {
+    kind: "staticArray";
+    elementType: string;
+    staticLength: number;
+};
+interface RenderTablePrimaryKey extends RenderTableType {
+    name: string;
+    isDynamic: false;
+}
+interface RenderTableStaticField extends RenderTableField {
+    isDynamic: false;
+}
+interface RenderTableDynamicField extends RenderTableField {
+    isDynamic: true;
+}
+interface RenderTableField extends RenderTableType {
+    arrayElement: RenderTableType | undefined;
+    name: string;
+    methodNameSuffix: string;
+}
+interface RenderTypesOptions {
+    /** List of enums to render */
+    enums: RenderTypesEnum[];
+}
+interface RenderTypesEnum {
+    name: string;
+    memberNames: string[];
+}
+interface RenderSystemInterfaceOptions {
+    /** List of symbols to import, and their file paths */
+    imports: ImportDatum[];
+    name: string;
+    functionPrefix: string;
+    functions: RenderSystemInterfaceFunction[];
+}
+interface RenderSystemInterfaceFunction {
+    name: string;
+    parameters: string[];
+    stateMutability: string;
+    returnParameters: string[];
+}
+interface RenderWorldOptions {
+    /** List of symbols to import, and their file paths */
+    imports: ImportDatum[];
+    /** Name of the interface to render */
+    interfaceName: string;
+    /** Path for store package imports */
+    storeImportPath: string;
+    /** Path for world package imports */
+    worldImportPath: string;
+}
+
+declare const renderedSolidityHeader = "// SPDX-License-Identifier: MIT\npragma solidity >=0.8.0;\n\n/* Autogenerated file. Do not edit manually. */";
+/**
+ * Renders a list of lines
+ */
+declare function renderList<T>(list: T[], renderItem: (item: T, index: number) => string): string;
+/**
+ * Renders a comma-separated list of arguments for solidity functions, ignoring empty and undefined ones
+ */
+declare function renderArguments(args: (string | undefined)[]): string;
+declare function renderCommonData({ staticResourceData, primaryKeys, }: Pick<RenderTableOptions, "staticResourceData" | "primaryKeys">): {
+    _tableId: string;
+    _typedTableId: string;
+    _keyArgs: string;
+    _typedKeyArgs: string;
+    _primaryKeysDefinition: string;
+};
+/** For 2 paths which are relative to a common root, create a relative import path from one to another */
+declare function solidityRelativeImportPath(fromPath: string, usedInPath: string): string;
+/**
+ * Aggregates, deduplicates and renders imports for symbols per path.
+ * Identical symbols from different paths are NOT handled, they should be checked before rendering.
+ */
+declare function renderImports(imports: ImportDatum[]): string;
+declare function renderWithStore(storeArgument: boolean, callback: (_typedStore: string | undefined, _store: string, _commentSuffix: string, _untypedStore: string | undefined) => string): string;
+declare function renderTableId(staticResourceData: StaticResourceData): {
+    hardcodedTableId: string;
+    tableIdDefinition: string;
+};
+
+declare function renderFieldMethods(options: RenderTableOptions): string;
+declare function renderEncodeField(field: RenderTableField): string;
+declare function renderDecodeValueType(field: RenderTableType, offset: number): string;
+
+declare function renderRecordMethods(options: RenderTableOptions): string;
+
+declare function renderTable(options: RenderTableOptions): string;
+
+declare function renderTypes(options: RenderTypesOptions): string;
+
+declare function renderTypesFromConfig(config: StoreConfig): string;
+
+declare function tablegen(config: StoreConfig, outputBaseDirectory: string): Promise<void>;
+
+interface TableOptions {
+    outputPath: string;
+    tableName: string;
+    renderOptions: RenderTableOptions;
+}
+declare function getTableOptions(config: StoreConfig): TableOptions[];
+
+type UserTypeInfo = ReturnType<typeof getUserTypeInfo>;
+/**
+ * Resolve an abi or user type into a SchemaType
+ */
+declare function resolveAbiOrUserType(abiOrUserType: string, config: StoreConfig): {
+    schemaType: SchemaType;
+    renderTableType: RenderTableType;
+};
+/**
+ * Get the required import for SchemaType|userType (`undefined` means that no import is required)
+ */
+declare function importForAbiOrUserType(abiOrUserType: string, usedInDirectory: string, config: StoreConfig): ImportDatum | undefined;
+declare function getSchemaTypeInfo(schemaType: SchemaType): RenderTableType;
+declare function getUserTypeInfo(userType: string, config: StoreConfig): {
+    schemaType: SchemaType;
+    renderTableType: RenderTableType;
+};
+
+export { ImportDatum, RenderSystemInterfaceFunction, RenderSystemInterfaceOptions, RenderTableDynamicField, RenderTableField, RenderTableOptions, RenderTablePrimaryKey, RenderTableStaticField, RenderTableType, RenderTableTypeWrappingData, RenderTypesEnum, RenderTypesOptions, RenderWorldOptions, StaticResourceData, TableOptions, UserTypeInfo, getSchemaTypeInfo, getTableOptions, getUserTypeInfo, importForAbiOrUserType, renderArguments, renderCommonData, renderDecodeValueType, renderEncodeField, renderFieldMethods, renderImports, renderList, renderRecordMethods, renderTable, renderTableId, renderTypes, renderTypesFromConfig, renderWithStore, renderedSolidityHeader, resolveAbiOrUserType, solidityRelativeImportPath, tablegen };

package/dist/render-solidity/index.js

@@ -0,0 +1,49 @@
+import {
+  getTableOptions,
+  renderArguments,
+  renderCommonData,
+  renderDecodeValueType,
+  renderEncodeField,
+  renderFieldMethods,
+  renderImports,
+  renderList,
+  renderRecordMethods,
+  renderTable,
+  renderTableId,
+  renderTypes,
+  renderTypesFromConfig,
+  renderWithStore,
+  renderedSolidityHeader,
+  solidityRelativeImportPath,
+  tablegen
+} from "../chunk-WZFXLDPK.js";
+import {
+  getSchemaTypeInfo,
+  getUserTypeInfo,
+  importForAbiOrUserType,
+  resolveAbiOrUserType
+} from "../chunk-SKNB74MT.js";
+import "../chunk-L4YLJHLJ.js";
+export {
+  getSchemaTypeInfo,
+  getTableOptions,
+  getUserTypeInfo,
+  importForAbiOrUserType,
+  renderArguments,
+  renderCommonData,
+  renderDecodeValueType,
+  renderEncodeField,
+  renderFieldMethods,
+  renderImports,
+  renderList,
+  renderRecordMethods,
+  renderTable,
+  renderTableId,
+  renderTypes,
+  renderTypesFromConfig,
+  renderWithStore,
+  renderedSolidityHeader,
+  resolveAbiOrUserType,
+  solidityRelativeImportPath,
+  tablegen
+};

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

@@ -0,0 +1,26 @@
+import { StoreConfig } from '@latticexyz/config';
+import { SchemaType } from '@latticexyz/schema-type';
+
+interface RecsV1TableOptions {
+    tables: {
+        tableName: string;
+        fields: {
+            recsTypeString: string;
+            name: string;
+        }[];
+        staticResourceData: {
+            namespace: string;
+            name: string;
+        };
+    }[];
+}
+
+declare function getRecsV1TableOptions(config: StoreConfig): RecsV1TableOptions;
+
+declare function renderRecsV1Tables(options: RecsV1TableOptions): string;
+
+declare const schemaTypesToRecsTypeStrings: Record<SchemaType, string>;
+
+declare function tsgen(config: StoreConfig, outDirectory: string): Promise<void>;
+
+export { RecsV1TableOptions, getRecsV1TableOptions, renderRecsV1Tables, schemaTypesToRecsTypeStrings, tsgen };

package/dist/render-ts/index.js

@@ -0,0 +1,14 @@
+import {
+  getRecsV1TableOptions,
+  renderRecsV1Tables,
+  schemaTypesToRecsTypeStrings,
+  tsgen
+} from "../chunk-6V563IAZ.js";
+import "../chunk-SKNB74MT.js";
+import "../chunk-L4YLJHLJ.js";
+export {
+  getRecsV1TableOptions,
+  renderRecsV1Tables,
+  schemaTypesToRecsTypeStrings,
+  tsgen
+};

package/dist/utils/deprecated/index.js

@@ -14,9 +14,9 @@ import {
   hsr,
   keccak256,
   resetLibDeploy
-} from "../../chunk-SLIMIO4Z.js";
-import "../../chunk-ATAWDHWC.js";
-import "../../chunk-O6HOO6WA.js";
+} from "../../chunk-VQTZJIFF.js";
+import "../../chunk-FPG73MVN.js";
+import "../../chunk-L4YLJHLJ.js";
 export {
   IDregex,
   deploy,

package/dist/utils/index.d.ts

@@ -1,21 +1,5 @@
-import { ZodError, z } from 'zod';
-import { ValidationError } from 'zod-validation-error';
-import { MUDConfig } from '../config/index.js';
-import '@latticexyz/schema-type';
+import { MUDConfig } from '@latticexyz/config';
 
-declare function fromZodErrorCustom(error: ZodError, prefix: string): ValidationError;
-declare class NotInsideProjectError extends Error {
-    name: string;
-    message: string;
-}
-declare class NotESMConfigError extends Error {
-    name: string;
-    message: string;
-}
-declare class MUDError extends Error {
-    name: string;
-}
-declare function UnrecognizedSystemErrorFactory(path: string[], systemName: string): z.ZodError<any>;
 declare function logError(error: unknown): void;
 
 interface ForgeConfig {
@@ -74,8 +58,18 @@ declare function forge(args: string[], options?: {
 declare function cast(args: string[], options?: {
     profile?: string;
 }): Promise<string>;
+/**
+ * Start an anvil chain
+ * @param args The arguments to pass to anvil
+ * @returns Stdout of the command
+ */
+declare function anvil(args: string[]): Promise<string>;
 
 declare function formatSolidity(content: string, prettierConfigPath?: string): Promise<string>;
+declare function formatTypescript(content: string): Promise<string>;
+
+declare function formatAndWriteSolidity(output: string, fullOutputPath: string, logPrefix: string): Promise<void>;
+declare function formatAndWriteTypescript(output: string, fullOutputPath: string, logPrefix: string): Promise<void>;
 
 interface DeployConfig {
     profile?: string;
@@ -83,6 +77,7 @@ interface DeployConfig {
     privateKey: string;
     priorityFeeMultiplier: number;
     debug?: boolean;
+    worldAddress?: string;
 }
 interface DeploymentInfo {
     blockNumber: number;
@@ -90,4 +85,4 @@ interface DeploymentInfo {
 }
 declare function deploy(mudConfig: MUDConfig, deployConfig: DeployConfig): Promise<DeploymentInfo>;
 
-export { DeployConfig, DeploymentInfo, ForgeConfig, MUDError, NotESMConfigError, NotInsideProjectError, UnrecognizedSystemErrorFactory, cast, deploy, forge, formatSolidity, fromZodErrorCustom, getForgeConfig, getOutDirectory, getRpcUrl, getScriptDirectory, getSrcDirectory, getTestDirectory, logError };
+export { DeployConfig, DeploymentInfo, ForgeConfig, anvil, cast, deploy, forge, formatAndWriteSolidity, formatAndWriteTypescript, formatSolidity, formatTypescript, getForgeConfig, getOutDirectory, getRpcUrl, getScriptDirectory, getSrcDirectory, getTestDirectory, logError };

package/dist/utils/index.js

@@ -1,16 +1,9 @@
 import {
   deploy,
-  formatSolidity
-} from "../chunk-O57QENJ6.js";
-import {
-  MUDError,
-  NotESMConfigError,
-  NotInsideProjectError,
-  UnrecognizedSystemErrorFactory,
-  fromZodErrorCustom,
   logError
-} from "../chunk-J4DJQNIC.js";
+} from "../chunk-4STWSICF.js";
 import {
+  anvil,
   cast,
   forge,
   getForgeConfig,
@@ -19,18 +12,23 @@ import {
   getScriptDirectory,
   getSrcDirectory,
   getTestDirectory
-} from "../chunk-ATAWDHWC.js";
-import "../chunk-O6HOO6WA.js";
+} from "../chunk-FPG73MVN.js";
+import {
+  formatAndWriteSolidity,
+  formatAndWriteTypescript,
+  formatSolidity,
+  formatTypescript
+} from "../chunk-SKNB74MT.js";
+import "../chunk-L4YLJHLJ.js";
 export {
-  MUDError,
-  NotESMConfigError,
-  NotInsideProjectError,
-  UnrecognizedSystemErrorFactory,
+  anvil,
   cast,
   deploy,
   forge,
+  formatAndWriteSolidity,
+  formatAndWriteTypescript,
   formatSolidity,
-  fromZodErrorCustom,
+  formatTypescript,
   getForgeConfig,
   getOutDirectory,
   getRpcUrl,

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@latticexyz/cli",
-  "version": "1.41.1-alpha.41+efdfeb310",
+  "version": "1.42.0",
   "description": "Command line interface for mud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "license": "MIT",
   "bin": {
-    "mud": "./dist/mud.js"
+    "mud": "./dist/mud.js",
+    "mud2": "./dist/mud2.js"
   },
   "repository": {
     "type": "git",
@@ -15,37 +16,39 @@
     "directory": "packages/cli"
   },
   "scripts": {
-    "prepare": "yarn build && chmod u+x git-install.sh",
-    "codegen": "ts-node --esm --files ./scripts/codegen.ts",
+    "prepare": "pnpm build",
+    "codegen": "tsx ./scripts/codegen.ts",
     "lint": "eslint . --ext .ts",
     "dev": "tsup --watch",
     "build": "tsup",
-    "link": "yarn link",
-    "test": "vitest typecheck --run && yarn test:contracts",
-    "test:contracts": "yarn codegen && forge test",
-    "git:install": "bash git-install.sh",
+    "test": "tsc --noEmit && pnpm test:contracts",
+    "test:contracts": "pnpm codegen && forge test",
     "release": "npm publish --access=public"
   },
   "devDependencies": {
-    "@latticexyz/store": "^1.41.1-alpha.41+efdfeb310",
     "@types/ejs": "^3.1.1",
     "@types/glob": "^7.2.0",
     "@types/node": "^17.0.34",
     "@types/openurl": "^1.0.0",
     "@types/yargs": "^17.0.10",
-    "esbuild": "^0.15.16",
     "tsup": "^6.6.3",
-    "vitest": "^0.29.1"
+    "tsx": "^3.12.6",
+    "vitest": "^0.29.8"
   },
   "dependencies": {
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/providers": "^5.7.2",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@latticexyz/schema-type": "^1.41.1-alpha.41+efdfeb310",
-    "@latticexyz/services": "^1.41.1-alpha.41+efdfeb310",
-    "@latticexyz/solecs": "^1.41.1-alpha.41+efdfeb310",
-    "@latticexyz/std-contracts": "^1.41.1-alpha.41+efdfeb310",
+    "@latticexyz/config": "1.42.0",
+    "@latticexyz/schema-type": "1.42.0",
+    "@latticexyz/services": "1.42.0",
+    "@latticexyz/solecs": "1.42.0",
+    "@latticexyz/std-contracts": "1.42.0",
+    "@latticexyz/store": "1.42.0",
+    "@latticexyz/world": "1.42.0",
     "@solidity-parser/parser": "^0.16.0",
-    "@typechain/ethers-v5": "^10.1.1",
+    "@typechain/ethers-v5": "^10.2.0",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
     "dotenv": "^16.0.3",
@@ -53,7 +56,6 @@
     "ejs": "^3.1.8",
     "ethers": "^5.7.2",
     "execa": "^7.0.0",
-    "find-up": "^6.3.0",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#b4f121555729b3afb3c5ffccb62ff4b6e2818fd3",
     "glob": "^8.0.3",
     "nice-grpc-web": "^2.0.1",
@@ -61,14 +63,12 @@
     "path": "^0.12.7",
     "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.1.2",
-    "solmate": "https://github.com/Rari-Capital/solmate.git#9cf1428245074e39090dceacb0c28b1f684f584c",
     "table": "^6.8.1",
-    "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
     "typescript": "^4.9.5",
     "yargs": "^17.7.1",
     "zod": "^3.21.4",
-    "zod-validation-error": "^1.0.1"
+    "zod-validation-error": "^1.3.0"
   },
-  "gitHead": "efdfeb3102429e76ed87352cf69465990004957b"
+  "gitHead": "ac0a61a9131ed2225a5342bd14f2d1354040511c"
 }