@latticexyz/world 2.2.20-306707570ec5fd27877d674502aa381d7fd89662 → 2.2.20-31870811b975d44f4b5d14ae69fd623914237584

package/dist/mud.config.d.ts

@@ -1,140 +1,17 @@
-/**
- * @internal
- */
-declare const configInput: {
-    readonly namespace: "world";
-    readonly codegen: {
-        readonly worldImportPath: "./src";
-        readonly worldgenDirectory: "interfaces";
-        readonly worldInterfaceName: "IBaseWorld";
-    };
-    readonly userTypes: {
-        readonly ResourceId: {
-            readonly filePath: "@latticexyz/store/src/ResourceId.sol";
-            readonly type: "bytes32";
-        };
-    };
-    readonly tables: {
-        readonly NamespaceOwner: {
-            readonly schema: {
-                readonly namespaceId: "ResourceId";
-                readonly owner: "address";
-            };
-            readonly key: readonly ["namespaceId"];
-        };
-        readonly ResourceAccess: {
-            readonly schema: {
-                readonly resourceId: "ResourceId";
-                readonly caller: "address";
-                readonly access: "bool";
-            };
-            readonly key: readonly ["resourceId", "caller"];
-        };
-        readonly InstalledModules: {
-            readonly schema: {
-                readonly moduleAddress: "address";
-                readonly argumentsHash: "bytes32";
-                readonly isInstalled: "bool";
-            };
-            readonly key: readonly ["moduleAddress", "argumentsHash"];
-        };
-        readonly UserDelegationControl: {
-            readonly schema: {
-                readonly delegator: "address";
-                readonly delegatee: "address";
-                readonly delegationControlId: "ResourceId";
-            };
-            readonly key: readonly ["delegator", "delegatee"];
-        };
-        readonly NamespaceDelegationControl: {
-            readonly schema: {
-                readonly namespaceId: "ResourceId";
-                readonly delegationControlId: "ResourceId";
-            };
-            readonly key: readonly ["namespaceId"];
-        };
-        readonly Balances: {
-            readonly schema: {
-                readonly namespaceId: "ResourceId";
-                readonly balance: "uint256";
-            };
-            readonly key: readonly ["namespaceId"];
-        };
-        readonly Systems: {
-            readonly schema: {
-                readonly systemId: "ResourceId";
-                readonly system: "address";
-                readonly publicAccess: "bool";
-            };
-            readonly key: readonly ["systemId"];
-            readonly codegen: {
-                readonly dataStruct: false;
-            };
-        };
-        readonly SystemRegistry: {
-            readonly schema: {
-                readonly system: "address";
-                readonly systemId: "ResourceId";
-            };
-            readonly key: readonly ["system"];
-        };
-        readonly SystemHooks: {
-            readonly schema: {
-                readonly systemId: "ResourceId";
-                readonly value: "bytes21[]";
-            };
-            readonly key: readonly ["systemId"];
-        };
-        readonly FunctionSelectors: {
-            readonly schema: {
-                readonly worldFunctionSelector: "bytes4";
-                readonly systemId: "ResourceId";
-                readonly systemFunctionSelector: "bytes4";
-            };
-            readonly key: readonly ["worldFunctionSelector"];
-            readonly codegen: {
-                readonly dataStruct: false;
-            };
-        };
-        readonly FunctionSignatures: {
-            readonly type: "offchainTable";
-            readonly schema: {
-                readonly functionSelector: "bytes4";
-                readonly functionSignature: "string";
-            };
-            readonly key: readonly ["functionSelector"];
-        };
-        readonly InitModuleAddress: {
-            readonly schema: {
-                readonly value: "address";
-            };
-            readonly key: readonly [];
-        };
-    };
-    readonly excludeSystems: readonly ["StoreRegistrationSystem"];
-};
-declare const _default: {
+/** @internal */
+declare const tablesConfig: {
     readonly namespace: string;
     readonly codegen: {
+        readonly outputDirectory: "codegen";
         readonly storeImportPath: "@latticexyz/store/src";
         readonly userTypesFilename: "common.sol";
-        readonly outputDirectory: "codegen";
         readonly indexFilename: "index.sol";
-        readonly worldInterfaceName: "IBaseWorld";
-        readonly worldgenDirectory: "interfaces";
-        readonly worldImportPath: "./src";
     } & {
-        readonly worldInterfaceName: "IBaseWorld";
-        readonly worldgenDirectory: "interfaces";
+        readonly worldInterfaceName: "IWorld";
+        readonly worldgenDirectory: "world";
         readonly systemLibrariesDirectory: "systems";
         readonly generateSystemLibraries: false;
-        readonly worldImportPath: "./src";
-    };
-    readonly userTypes: {
-        readonly ResourceId: {
-            readonly filePath: "@latticexyz/store/src/ResourceId.sol";
-            readonly type: "bytes32";
-        };
+        readonly worldImportPath: "@latticexyz/world/src";
     };
     readonly tables: {
         readonly world__NamespaceOwner: {
@@ -491,6 +368,12 @@ declare const _default: {
         };
     };
     readonly sourceDirectory: "src";
+    readonly userTypes: {
+        readonly ResourceId: {
+            readonly filePath: "@latticexyz/store/src/ResourceId.sol";
+            readonly type: "bytes32";
+        };
+    };
     readonly enums: {};
     readonly multipleNamespaces: false;
     readonly enumValues: {};
@@ -856,7 +739,235 @@ declare const _default: {
         };
     };
     readonly systems: {};
-    readonly excludeSystems: readonly ["StoreRegistrationSystem"];
+    readonly excludeSystems: readonly [];
+    readonly modules: readonly [];
+    readonly deploy: {
+        readonly postDeployScript: "PostDeploy";
+        readonly deploysDirectory: "./deploys";
+        readonly worldsFile: "./worlds.json";
+        readonly upgradeableWorldImplementation: false;
+    };
+};
+/** @internal */
+declare const systemsConfig: {
+    readonly namespace: string;
+    readonly codegen: {
+        readonly outputDirectory: "codegen";
+        readonly storeImportPath: "@latticexyz/store/src";
+        readonly userTypesFilename: "common.sol";
+        readonly indexFilename: "index.sol";
+        readonly worldInterfaceName: "IBaseWorld";
+        readonly worldgenDirectory: "interfaces";
+        readonly systemLibrariesDirectory: "experimental/systems";
+        readonly generateSystemLibraries: true;
+        readonly worldImportPath: "./src";
+    } & {
+        readonly worldInterfaceName: "IBaseWorld";
+        readonly worldgenDirectory: "interfaces";
+        readonly systemLibrariesDirectory: "experimental/systems";
+        readonly generateSystemLibraries: true;
+        readonly worldImportPath: "./src";
+    };
+    readonly tables: {};
+    readonly sourceDirectory: "src";
+    readonly userTypes: {};
+    readonly enums: {};
+    readonly multipleNamespaces: false;
+    readonly enumValues: {};
+    readonly namespaces: {
+        readonly "": {
+            readonly label: "";
+            readonly namespace: string;
+            readonly tables: {};
+            readonly systems: {
+                readonly AccessManagementSystem: {
+                    readonly label: "AccessManagementSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly BalanceTransferSystem: {
+                    readonly label: "BalanceTransferSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly BatchCallSystem: {
+                    readonly label: "BatchCallSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly RegistrationSystem: {
+                    readonly label: "RegistrationSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly ModuleInstallationSystem: {
+                    readonly label: "ModuleInstallationSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly StoreRegistrationSystem: {
+                    readonly label: "StoreRegistrationSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+                readonly WorldRegistrationSystem: {
+                    readonly label: "WorldRegistrationSystem";
+                    readonly namespaceLabel: "";
+                    readonly namespace: string;
+                    readonly name: string;
+                    readonly systemId: `0x${string}`;
+                    readonly openAccess: true;
+                    readonly accessList: readonly [];
+                    readonly deploy: {
+                        readonly disabled: false;
+                        readonly registerWorldFunctions: true;
+                    };
+                };
+            };
+        };
+    };
+    readonly systems: {
+        readonly AccessManagementSystem: {
+            readonly label: "AccessManagementSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly BalanceTransferSystem: {
+            readonly label: "BalanceTransferSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly BatchCallSystem: {
+            readonly label: "BatchCallSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly RegistrationSystem: {
+            readonly label: "RegistrationSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly ModuleInstallationSystem: {
+            readonly label: "ModuleInstallationSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly StoreRegistrationSystem: {
+            readonly label: "StoreRegistrationSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+        readonly WorldRegistrationSystem: {
+            readonly label: "WorldRegistrationSystem";
+            readonly namespaceLabel: string;
+            readonly namespace: string;
+            readonly name: string;
+            readonly systemId: `0x${string}`;
+            readonly openAccess: true;
+            readonly accessList: readonly [];
+            readonly deploy: {
+                readonly disabled: false;
+                readonly registerWorldFunctions: true;
+            };
+        };
+    };
+    readonly excludeSystems: readonly [];
     readonly modules: readonly [];
     readonly deploy: {
         readonly postDeployScript: "PostDeploy";
@@ -866,4 +977,4 @@ declare const _default: {
     };
 };
 
-export { configInput, _default as default };
+export { tablesConfig as default, systemsConfig, tablesConfig };

package/dist/mud.config.js

@@ -1,12 +1,14 @@
 import {
-  configInput,
-  mud_config_default
-} from "./chunk-SGZK356L.js";
-import "./chunk-2W4TKC47.js";
-import "./chunk-XSBK355I.js";
+  mud_config_default,
+  systemsConfig,
+  tablesConfig
+} from "./chunk-6KRKTNJ5.js";
+import "./chunk-NVV4GS3R.js";
+import "./chunk-6E2JY6MZ.js";
 import "./chunk-5WRI5ZAA.js";
 export {
-  configInput,
-  mud_config_default as default
+  mud_config_default as default,
+  systemsConfig,
+  tablesConfig
 };
 //# sourceMappingURL=mud.config.js.map

package/dist/node.d.ts

@@ -1,5 +1,5 @@
 import { ImportDatum, ContractInterfaceFunction, ContractInterfaceError } from '@latticexyz/common/codegen';
-import { W as World, c as System } from './dynamicResolution-AmVd5Qtd.js';
+import { W as World, c as System } from './dynamicResolution-Bul4y_B0.js';
 import { Hex, Abi } from 'viem';
 import * as arktype_internal_subtypes_object_ts from 'arktype/internal/subtypes/object.ts';
 import * as arktype_internal_ast_ts from 'arktype/internal/ast.ts';

package/dist/node.js

@@ -1,6 +1,6 @@
 import {
   resolveNamespace
-} from "./chunk-XSBK355I.js";
+} from "./chunk-6E2JY6MZ.js";
 import {
   __commonJS,
   __toESM
@@ -390,10 +390,10 @@ function renderErrors(errors) {
 }
 function renderUserTypeFunction(contractFunction, userTypeName) {
   const { name, parameters, stateMutability, returnParameters } = contractFunction;
-  const allParameters = [`${userTypeName} self`, ...parameters];
+  const args = [`${userTypeName} self`, ...parameters].map((arg) => arg.replace(/ calldata /, " memory "));
   const functionSignature = `
     function ${name}(
-      ${renderArguments2(allParameters)}
+      ${renderArguments2(args)}
     ) internal
       ${stateMutability === "pure" ? "view" : stateMutability}
       ${renderReturnParameters2(returnParameters)}
@@ -407,10 +407,10 @@ function renderUserTypeFunction(contractFunction, userTypeName) {
 }
 function renderCallWrapperFunction(contractFunction, callingFromRootSystemErrorName) {
   const { name, parameters, stateMutability, returnParameters } = contractFunction;
-  const functionArguments = [`CallWrapper memory self`, ...parameters];
+  const args = [`CallWrapper memory self`, ...parameters].map((arg) => arg.replace(/ calldata /, " memory "));
   const functionSignature = `
     function ${name}(
-      ${renderArguments2(functionArguments)}
+      ${renderArguments2(args)}
     ) internal
       ${stateMutability === "pure" ? "view" : stateMutability}
       ${renderReturnParameters2(returnParameters)}
@@ -451,10 +451,10 @@ function renderRootCallWrapperFunction(contractFunction, namespace) {
   if (namespace === "" && stateMutability != "") {
     return "";
   }
-  const functionArguments = ["RootCallWrapper memory self", ...parameters];
+  const args = ["RootCallWrapper memory self", ...parameters].map((arg) => arg.replace(/ calldata /, " memory "));
   const functionSignature = `
     function ${name}(
-      ${renderArguments2(functionArguments)}
+      ${renderArguments2(args)}
     ) internal
       ${stateMutability === "pure" ? "view" : stateMutability}
       ${renderReturnParameters2(returnParameters)}
@@ -481,10 +481,11 @@ function renderRootCallWrapperFunction(contractFunction, namespace) {
 }
 function renderFunctionInterface(contractFunction) {
   const { name, parameters } = contractFunction;
+  const args = parameters.map((arg) => arg.replace(/ calldata /, " memory "));
   return `
     interface ${functionInterfaceName(contractFunction)} {
       function ${name}(
-        ${renderArguments2(parameters)}
+        ${renderArguments2(args)}
       ) external;
     }
   `;
@@ -520,16 +521,17 @@ function renderWorldInterface({
   worldImportPath,
   imports: initialImports
 }) {
-  const imports = [
-    ...interfaceName === "IBaseWorld" ? [
-      { symbol: "IStore", path: `${storeImportPath}/IStore.sol` },
-      { symbol: "IWorldKernel", path: `${worldImportPath}/IWorldKernel.sol` }
-    ] : [
-      {
-        symbol: "IBaseWorld",
-        path: `${worldImportPath}/codegen/interfaces/IBaseWorld.sol`
-      }
-    ],
+  const imports = interfaceName === "IBaseWorld" ? [
+    { symbol: "IStore", path: `${storeImportPath}/IStore.sol` },
+    { symbol: "IWorldKernel", path: `${worldImportPath}/IWorldKernel.sol` },
+    // filter out IStoreRegistrationSystem as it's already included as part of IStore
+    // and having both causes compiler conflicts because of overlapping functions
+    ...initialImports.filter(({ symbol }) => symbol !== "IStoreRegistrationSystem")
+  ] : [
+    {
+      symbol: "IBaseWorld",
+      path: `${worldImportPath}/codegen/interfaces/IBaseWorld.sol`
+    },
     ...initialImports
   ];
   const importSymbols = imports.map(({ symbol }) => symbol);
@@ -7108,7 +7110,7 @@ async function worldgen({
           errors,
           imports: [systemImport, ...libraryImports],
           storeImportPath,
-          worldImportPath
+          worldImportPath: config.codegen.worldImportPath.startsWith(".") ? "./" + path4.relative(path4.dirname(system.libraryPath), path4.join(rootDir, config.codegen.worldImportPath)) : config.codegen.worldImportPath
         });
         await formatAndWriteSolidity(systemLibrary, system.libraryPath, "Generated system library");
       }
@@ -7268,7 +7270,7 @@ var SystemsManifest = type3({
 });
 async function buildSystemsManifest(opts) {
   const { default: IBaseWorldAbi } = await import("./IBaseWorld.abi-L4NKVDJN.js");
-  const { default: SystemAbi } = await import("./System.abi-ENBBMWQJ.js");
+  const { default: SystemAbi } = await import("./System.abi-QE5PR27M.js");
   const excludedAbi = formatAbi([
     ...IBaseWorldAbi.filter((item) => item.type === "event" || item.type === "error"),
     ...SystemAbi