refactor(store,world): simplify table shorthands

.changeset/wicked-numbers-check.md

@@ -0,0 +1,6 @@
+---
+"@latticexyz/store": patch
+"@latticexyz/world": patch
+---
+
+Refactored how the config handles shorthand table definitions, greatly simplifying the codebase. This will make it easier to add support for multiple namespaces.

packages/store/ts/config/v2/index.ts

@@ -2,7 +2,6 @@ export * from "./generics";
 export * from "./scope";
 export * from "./schema";
 export * from "./tableShorthand";
-export * from "./storeWithShorthands";
 export * from "./table";
 export * from "./tables";
 export * from "./store";

packages/store/ts/config/v2/input.ts

@@ -1,7 +1,6 @@
 import { Hex } from "viem";
 import { Codegen, TableCodegen, TableDeploy, UserTypes } from "./output";
 import { Scope } from "./scope";
-import { show } from "@arktype/util";
 
 export type EnumsInput = {
   readonly [enumName: string]: readonly [string, ...string[]];
@@ -45,9 +44,12 @@ export type TableInput = {
   readonly deploy?: TableDeployInput;
 };
 
+export type TableShorthandInput = SchemaInput | string;
+
 export type TablesInput = {
-  // remove label and namespace as these are set contextually
-  readonly [label: string]: Omit<TableInput, "label" | "namespace">;
+  // remove label and namespace from table input as these are set contextually
+  // and allow defining a table using shorthand
+  readonly [label: string]: Omit<TableInput, "label" | "namespace"> | TableShorthandInput;
 };
 
 export type CodegenInput = Partial<Codegen>;
@@ -78,15 +80,3 @@ export type StoreInput = Omit<NamespaceInput, "label"> & {
   readonly enums?: EnumsInput;
   readonly codegen?: CodegenInput;
 };
-
-/******** Variations with shorthands ********/
-
-export type TableShorthandInput = SchemaInput | string;
-
-export type TablesWithShorthandsInput = {
-  readonly [label: string]: TablesInput[string] | TableShorthandInput;
-};
-
-export type StoreWithShorthandsInput = show<
-  Omit<StoreInput, "tables"> & { readonly tables?: TablesWithShorthandsInput }
->;

packages/store/ts/config/v2/namespace.ts

@@ -3,6 +3,7 @@ import { hasOwnKey, mergeIfUndefined } from "./generics";
 import { NamespaceInput } from "./input";
 import { resolveTables, validateTables } from "./tables";
 import { AbiTypeScope, Scope } from "./scope";
+import { expandTableShorthand } from "./tableShorthand";
 
 export type validateNamespace<input, scope extends Scope = AbiTypeScope> = {
   [key in keyof input]: key extends "tables"
@@ -33,7 +34,7 @@ export type resolveNamespace<input, scope extends Scope = AbiTypeScope> = input
         : resolveTables<
             {
               readonly [label in keyof input["tables"]]: mergeIfUndefined<
-                input["tables"][label],
+                expandTableShorthand<input["tables"][label]>,
                 { readonly namespace: string }
               >;
             },
@@ -53,7 +54,7 @@ export function resolveNamespace<const input extends NamespaceInput, scope exten
     namespace,
     tables: resolveTables(
       flatMorph(input.tables ?? {}, (label, table) => {
-        return [label, mergeIfUndefined(table, { namespace })];
+        return [label, mergeIfUndefined(expandTableShorthand(table, scope), { namespace })];
       }),
       scope,
     ),

packages/store/ts/config/v2/namespacedTables.ts

@@ -1,4 +1,4 @@
-import { flatMorph } from "@arktype/util";
+import { flatMorph, show } from "@arktype/util";
 import { Tables } from "./output";
 
 /**
@@ -16,7 +16,7 @@ export type resolveNamespacedTables<tables, namespace> = {
 export function resolveNamespacedTables<tables, namespace>(
   tables: tables,
   namespace: namespace,
-): resolveNamespacedTables<tables, namespace> {
+): show<resolveNamespacedTables<tables, namespace>> {
   return flatMorph(tables as Tables, (label, table) => [
     namespace === "" ? label : `${namespace}__${label}`,
     table,