Use systems as default directory for system libraries

latticexyz · Nov 26, 2024 · ca6e07d · ca6e07d
1 parent ce80658
commit ca6e07d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/docs/pages/world/systems.mdx b/docs/pages/world/systems.mdx
@@ -245,7 +245,7 @@ pragma solidity >=0.8.24;
 import { System } from "@latticexyz/world/src/System.sol";
 
 // Library generated for MoveSystem,
-import { moveSystem } from "./codegen/libraries/MoveSystemLib.sol";
+import { moveSystem } from "./codegen/systems/MoveSystemLib.sol";
 
 contract MySystem is System {
   function someAction(uint256 x, uint256 y) external {

diff --git a/packages/world/ts/config/v2/defaults.ts b/packages/world/ts/config/v2/defaults.ts
@@ -26,7 +26,7 @@ export type MODULE_DEFAULTS = typeof MODULE_DEFAULTS;
 export const CODEGEN_DEFAULTS = {
   worldInterfaceName: "IWorld",
   worldgenDirectory: "world",
-  systemLibrariesDirectory: "libraries",
+  systemLibrariesDirectory: "systems",
   generateSystemLibraries: false,
   worldImportPath: "@latticexyz/world/src",
 } as const satisfies CodegenInput;

diff --git a/...spaces/a/codegen/libraries/ASystemLib.sol → ...mespaces/a/codegen/systems/ASystemLib.sol b/...spaces/a/codegen/libraries/ASystemLib.sol → ...mespaces/a/codegen/systems/ASystemLib.sol
diff --git a/test/system-libraries/src/namespaces/b/BSystem.sol b/test/system-libraries/src/namespaces/b/BSystem.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.28;
 
 import { System } from "@latticexyz/world/src/System.sol";
-import { aSystem } from "../a/codegen/libraries/ASystemLib.sol";
+import { aSystem } from "../a/codegen/systems/ASystemLib.sol";
 
 contract BSystem is System {
   function setValueInA(uint256 value) external {

diff --git a/...spaces/b/codegen/libraries/BSystemLib.sol → ...mespaces/b/codegen/systems/BSystemLib.sol b/...spaces/b/codegen/libraries/BSystemLib.sol → ...mespaces/b/codegen/systems/BSystemLib.sol
diff --git a/test/system-libraries/src/namespaces/root/RootSystem.sol b/test/system-libraries/src/namespaces/root/RootSystem.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.28;
 
 import { System } from "@latticexyz/world/src/System.sol";
-import { aSystem } from "../a/codegen/libraries/ASystemLib.sol";
+import { aSystem } from "../a/codegen/systems/ASystemLib.sol";
 
 contract RootSystem is System {
   function setValueInA(uint256 value) external {

diff --git a/.../root/codegen/libraries/RootSystemLib.sol → ...es/root/codegen/systems/RootSystemLib.sol b/.../root/codegen/libraries/RootSystemLib.sol → ...es/root/codegen/systems/RootSystemLib.sol
diff --git a/test/system-libraries/test/Libraries.t.sol b/test/system-libraries/test/Libraries.t.sol
@@ -14,9 +14,9 @@ import { SYSTEMBOUND_DELEGATION } from "@latticexyz/world-modules/src/modules/st
 
 import { Value } from "../src/namespaces/a/codegen/tables/Value.sol";
 import { AddressValue } from "../src/namespaces/a/codegen/tables/AddressValue.sol";
-import { aSystem } from "../src/namespaces/a/codegen/libraries/ASystemLib.sol";
-import { bSystem } from "../src/namespaces/b/codegen/libraries/BSystemLib.sol";
-import { rootSystem } from "../src/namespaces/root/codegen/libraries/RootSystemLib.sol";
+import { aSystem } from "../src/namespaces/a/codegen/systems/ASystemLib.sol";
+import { bSystem } from "../src/namespaces/b/codegen/systems/BSystemLib.sol";
+import { rootSystem } from "../src/namespaces/root/codegen/systems/RootSystemLib.sol";
 
 contract LibrariesTest is MudTest {
   function testNamespaceIdExists() public {