feat(world): enable config namespaces key

examples/minimal/packages/contracts/mud.config.ts

@@ -37,6 +37,19 @@ export default defineWorld({
       key: ["owner", "item", "itemVariant"],
     },
   },
+  namespaces: {
+    royale: {
+      tables: {
+        Health: {
+          schema: {
+            player: "address",
+            value: "uint256",
+          },
+          key: ["player"],
+        },
+      },
+    },
+  },
   modules: [
     {
       artifactPath: "@latticexyz/world-modules/out/KeysWithValueModule.sol/KeysWithValueModule.json",

packages/world/ts/config/v2/namespaces.ts

@@ -10,6 +10,7 @@ import {
   getPath,
 } from "@latticexyz/store/config/v2";
 import { NamespacesInput } from "./input";
+import { ErrorMessage } from "@arktype/util";
 
 export type namespacedTableKeys<world> = world extends { namespaces: infer namespaces }
   ? {
@@ -23,7 +24,7 @@ export type validateNamespaces<namespaces, scope extends Scope = AbiTypeScope> =
   [namespace in keyof namespaces]: {
     [key in keyof namespaces[namespace]]: key extends "tables"
       ? validateTables<namespaces[namespace][key], scope>
-      : namespaces[namespace][key];
+      : ErrorMessage<`Expected full tables config.`>;
   };
 };
 

packages/world/ts/config/v2/world.test.ts

@@ -21,7 +21,6 @@ const CODEGEN_DEFAULTS = { ...STORE_CODEGEN_DEFAULTS, ...WORLD_CODEGEN_DEFAULTS
 describe("defineWorld", () => {
   it("should resolve namespaced tables", () => {
     const config = defineWorld({
-      // @ts-expect-error TODO: remove once namespaces support ships
       namespaces: {
         ExampleNamespace: {
           tables: {
@@ -77,7 +76,6 @@ describe("defineWorld", () => {
 
   it("should resolve namespaced table config with user types and enums", () => {
     const config = defineWorld({
-      // @ts-expect-error TODO: remove once namespaces support ships
       namespaces: {
         ExampleNamespace: {
           tables: {
@@ -150,7 +148,6 @@ describe("defineWorld", () => {
 
   it("should extend the output World type", () => {
     const config = defineWorld({
-      // @ts-expect-error TODO: remove once namespaces support ships
       namespaces: {
         ExampleNamespace: {
           tables: {
@@ -180,7 +177,6 @@ describe("defineWorld", () => {
   it("should not use the global namespace for namespaced tables", () => {
     const config = defineWorld({
       namespace: "namespace",
-      // @ts-expect-error TODO: remove once namespaces support ships
       namespaces: {
         AnotherOne: {
           tables: {
@@ -709,13 +705,13 @@ describe("defineWorld", () => {
   it.skip("should throw if name is overridden in namespaced tables", () => {
     attest(() =>
       defineWorld({
-        // @ts-expect-error TODO: remove once namespaces support ships
         namespaces: {
           MyNamespace: {
             tables: {
               Example: {
                 schema: { id: "address" },
                 key: ["id"],
+                // @ts-expect-error "Overrides of `name` and `namespace` are not allowed for tables in a store config"
                 name: "NotAllowed",
               },
             },
@@ -728,13 +724,13 @@ describe("defineWorld", () => {
   it.skip("should throw if namespace is overridden in namespaced tables", () => {
     attest(() =>
       defineWorld({
-        // @ts-expect-error TODO: remove once namespaces support ships
         namespaces: {
           MyNamespace: {
             tables: {
               Example: {
                 schema: { id: "address" },
                 key: ["id"],
+                // @ts-expect-error "Overrides of `name` and `namespace` are not allowed for tables in a store config"
                 namespace: "NotAllowed",
               },
             },
@@ -747,7 +743,6 @@ describe("defineWorld", () => {
   it("should throw if namespaces are defined (TODO: remove once namespaces support ships)", () => {
     attest(() =>
       defineWorld({
-        // @ts-expect-error TODO: remove once namespaces support ships
         namespaces: {},
       }),
     ).type.errors("Namespaces config will be enabled soon.");

packages/world/ts/config/v2/world.ts

@@ -17,7 +17,7 @@ import { SystemsInput, WorldInput } from "./input";
 import { CONFIG_DEFAULTS, MODULE_DEFAULTS } from "./defaults";
 import { Tables } from "@latticexyz/store/internal";
 import { resolveSystems } from "./systems";
-import { resolveNamespacedTables } from "./namespaces";
+import { resolveNamespacedTables, validateNamespaces } from "./namespaces";
 import { resolveCodegen } from "./codegen";
 import { resolveDeploy } from "./deploy";
 
@@ -29,8 +29,7 @@ export type validateWorld<world> = {
       : key extends "enums"
         ? narrow<world[key]>
         : key extends "namespaces"
-          ? // ? validateNamespaces<world[key], extendedScope<world>>
-            ErrorMessage<`Namespaces config will be enabled soon.`>
+          ? validateNamespaces<world[key], extendedScope<world>>
           : key extends keyof WorldInput
             ? conform<world[key], WorldInput[key]>
             : ErrorMessage<`\`${key & string}\` is not a valid World config option.`>;
@@ -75,22 +74,40 @@ export function resolveWorld<const world extends WorldInput>(world: world): reso
   const scope = extendedScope(world);
   const namespaces = world.namespaces ?? {};
 
+  if (world.namespaces) {
+    if (!world.codegen) {
+      world.codegen = {};
+    }
+    if (world.codegen.namespaceDirectories === undefined) {
+      world.codegen = { ...world.codegen, namespaceDirectories: true };
+    }
+  }
+
+  const resolvedStore = resolveStore(world);
+
   const resolvedNamespacedTables = Object.fromEntries(
     Object.entries(namespaces)
       .map(([namespaceKey, namespace]) =>
         Object.entries(namespace.tables ?? {}).map(([tableKey, table]) => {
           validateTable(table, scope);
           return [
             `${namespaceKey}__${tableKey}`,
-            resolveTable(mergeIfUndefined(table, { namespace: namespaceKey, name: tableKey }), scope),
+            resolveTable(
+              mergeIfUndefined(table, {
+                namespace: namespaceKey,
+                name: tableKey,
+                codegen: mergeIfUndefined(table.codegen ?? {}, {
+                  outputDirectory: resolvedStore.codegen.namespaceDirectories ? `${namespaceKey}/tables` : "tables",
+                }),
+              }),
+              scope,
+            ),
           ];
         }),
       )
       .flat(),
   ) as Tables;
 
-  const resolvedStore = resolveStore(world);
-
   const modules = (world.modules ?? CONFIG_DEFAULTS.modules).map((mod) => mergeIfUndefined(mod, MODULE_DEFAULTS));
 
   return mergeIfUndefined(