refactor: remove */config/v2 exports (#3322)

docs/pages/guides/extending-a-world/index.mdx → docs/pages/guides/extending-a-world.mdx

@@ -1,6 +1,6 @@
-import { CollapseCode } from "../../../components/CollapseCode";
+import { CollapseCode } from "../../components/CollapseCode";
 
-# Extending a World Permissionlessly
+# Extending a World
 
 On this page you learn how to modify a `World` that is already deployed to the blockchain, without using a privileged address, such as the one that initially deployed it.
 If you want to learn how to modify a `World` before it is deployed, [see the hello world page](../hello-world).
@@ -660,7 +660,7 @@ We will fix these problems now.
 1. Now you can click **Increment** in the user interface and create messages.
    The user interface does not display those messages, but you can open the **MUD Dev Tools**, click the **Components** tab, and select **messagings\_\_Messages** to view them.
 
-   ![The extended UI with the messages shown in the MUD Dev Tools](./extend-ui-with-msgs.png)
+   ![The extended UI with the messages shown in the MUD Dev Tools](./extending-a-world/extend-ui-with-msgs.png)
 
 ### Read the counter
 
@@ -696,7 +696,7 @@ We will now fix this.
 
    <CollapseCode>
 
-   ```ts filename="setupNetwork.ts" copy showLineNumbers {24-25,38,96}
+   ```ts filename="setupNetwork.ts" copy showLineNumbers {34,92}
    /*
     * The MUD client code is built on top of viem
     * (https://viem.sh/docs/getting-started.html).
@@ -719,10 +719,6 @@ We will now fix this.
    import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json";
    import { createBurnerAccount, transportObserver, ContractWrite } from "@latticexyz/common";
    import { transactionQueue, writeObserver } from "@latticexyz/common/actions";
-
-   import { resolveConfig } from "@latticexyz/store/internal";
-   import { storeToV1 } from "@latticexyz/store/config/v2";
-
    import { Subject, share } from "rxjs";
 
    /*
@@ -792,7 +788,7 @@ We will now fix this.
        address: networkConfig.worldAddress as Hex,
        publicClient,
        startBlock: BigInt(networkConfig.initialBlockNumber),
-       tables: resolveConfig(storeToV1(counterConfig)).tables,
+       tables: counterConfig.tables,
      });
 
      return {

packages/dev-tools/src/mount.tsx

@@ -1,4 +1,4 @@
-import type { Store as StoreConfig } from "@latticexyz/store/config/v2";
+import type { Store as StoreConfig } from "@latticexyz/store";
 import type { DevToolsOptions } from "./common";
 
 const containerId = "mud-dev-tools";

packages/stash/src/actions/decodeKey.test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from "vitest";
 import { createStash } from "../createStash";
-import { defineStore } from "@latticexyz/store/config/v2";
+import { defineStore } from "@latticexyz/store";
 import { setRecord } from "./setRecord";
 import { encodeKey } from "./encodeKey";
 import { attest } from "@ark/attest";

packages/stash/src/actions/encodeKey.test.ts

@@ -1,7 +1,7 @@
 import { attest } from "@ark/attest";
 import { describe, it } from "vitest";
 import { encodeKey } from "./encodeKey";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 
 describe("encodeKey", () => {
   it("should encode a key to a string", () => {

packages/stash/src/actions/getTable.test.ts

@@ -1,5 +1,5 @@
 import { attest } from "@ark/attest";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { describe, it, expect, vi } from "vitest";
 import { createStash } from "../createStash";
 import { getTable } from "./getTable";

packages/stash/src/actions/getTableConfig.test.ts

@@ -1,4 +1,4 @@
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { describe, it } from "vitest";
 import { createStash } from "../createStash";
 import { attest } from "@ark/attest";

packages/stash/src/actions/registerTable.test.ts

@@ -1,5 +1,5 @@
 import { attest } from "@ark/attest";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { describe, it, expect } from "vitest";
 import { createStash } from "../createStash";
 import { registerTable } from "./registerTable";

packages/stash/src/actions/setRecord.test.ts

@@ -1,4 +1,4 @@
-import { defineStore } from "@latticexyz/store/config/v2";
+import { defineStore } from "@latticexyz/store";
 import { describe, it } from "vitest";
 import { createStash } from "../createStash";
 import { attest } from "@ark/attest";

packages/stash/src/apiEquality.test.ts

@@ -3,7 +3,7 @@ import { createStash } from "./createStash";
 import { attest } from "@ark/attest";
 import { BoundTable } from "./actions/getTable";
 import { DefaultActions } from "./decorators/defaultActions";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 
 describe("stash actions, bound table", () => {
   const stash = createStash();

packages/stash/src/boundTable.test.ts

@@ -4,7 +4,7 @@ import { createStash } from "./createStash";
 import { BoundTable } from "./actions/getTable";
 import { Stash } from "./common";
 import { DefaultActions } from "./decorators/defaultActions";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 
 describe("BoundTable", () => {
   const tableConfig = defineTable({

packages/stash/src/createStash.test.ts

@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
 import { attest } from "@ark/attest";
 import { CreateStashResult, createStash } from "./createStash";
-import { defineStore, defineTable } from "@latticexyz/store/config/v2";
+import { defineStore } from "@latticexyz/store";
+import { defineTable } from "@latticexyz/store/internal";
 import { Hex } from "viem";
 
 describe("createStash", () => {

packages/stash/src/createStash.ts

@@ -1,7 +1,7 @@
 import { MutableState, Stash, StoreConfig, StoreSubscribers, TableSubscribers } from "./common";
 import { DefaultActions, defaultActions } from "./decorators/defaultActions";
 import { extend } from "./actions/extend";
-import { Table } from "@latticexyz/store/config/v2";
+import { Table } from "@latticexyz/store/internal";
 
 export type Config = StoreConfig;
 

packages/stash/src/decorators/defaultActions.test.ts

@@ -2,7 +2,7 @@ import { attest } from "@ark/attest";
 import { defineStore } from "@latticexyz/store";
 import { describe, expect, it, vi } from "vitest";
 import { createStash } from "../createStash";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { In } from "../queryFragments";
 import { Hex } from "viem";
 import { runQuery } from "../actions";

packages/store-sync/src/logToRecord.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 import { describe, it, expect } from "vitest";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { logToRecord } from "./logToRecord";
 
 describe("logToRecord", () => {

packages/store-sync/src/recordToLog.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 import { describe, it, expect } from "vitest";
 import { recordToLog } from "./recordToLog";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { logToRecord } from "./logToRecord";
 
 describe("recordToLog", () => {

packages/store-sync/src/stash/syncToStash.ts

@@ -1,6 +1,6 @@
 import { getRecord, setRecord, registerTable, Stash } from "@latticexyz/stash/internal";
 import { createStorageAdapter } from "./createStorageAdapter";
-import { defineTable } from "@latticexyz/store/config/v2";
+import { defineTable } from "@latticexyz/store/internal";
 import { SyncStep } from "../SyncStep";
 import { SyncOptions, SyncResult } from "../common";
 import { createStoreSync } from "../createStoreSync";

packages/store/package.json

@@ -14,7 +14,6 @@
     "./internal": "./dist/internal.js",
     "./mud.config": "./dist/mud.config.js",
     "./codegen": "./dist/codegen.js",
-    "./config/v2": "./dist/config/v2.js",
     "./out/*": "./out/*"
   },
   "typesVersions": {
@@ -30,9 +29,6 @@
       ],
       "codegen": [
         "./dist/codegen.d.ts"
-      ],
-      "config/v2": [
-        "./dist/config/v2.d.ts"
       ]
     }
   },

packages/store/ts/common.ts

@@ -1,5 +1,4 @@
 import { SchemaAbiType, SchemaAbiTypeToPrimitiveType, StaticAbiType } from "@latticexyz/schema-type/internal";
-import { Hex } from "viem";
 
 export type KeySchema = {
   readonly [k: string]: {
@@ -12,18 +11,6 @@ export type ValueSchema = {
   };
 };
 
-export type Table = {
-  readonly tableId: Hex;
-  readonly namespace: string;
-  readonly name: string;
-  readonly keySchema: KeySchema;
-  readonly valueSchema: ValueSchema;
-};
-
-export type Tables = {
-  readonly [k: string]: Table;
-};
-
 /** Map a table schema like `{ value: { type: "uint256" } }` to its primitive types like `{ value: bigint }` */
 export type SchemaToPrimitives<schema extends ValueSchema> = {
   readonly [key in keyof schema]: SchemaAbiTypeToPrimitiveType<schema[key]["type"]>;

packages/store/ts/config/v2/generics.ts

@@ -1,3 +1,5 @@
+// TODO: move to common/utils
+
 export type get<input, key> = key extends keyof input ? input[key] : undefined;
 
 export function get<input, key extends PropertyKey>(input: input, key: key): get<input, key> {

packages/store/ts/exports/internal.ts

@@ -1,3 +1,16 @@
 export * from "../common";
 export * from "../getStoreLogs";
 export * from "../flattenStoreLogs";
+
+export * from "../config/v2/input";
+export * from "../config/v2/output";
+export * from "../config/v2/store";
+export * from "../config/v2/generics";
+export * from "../config/v2/defaults";
+export * from "../config/v2/table";
+export * from "../config/v2/tables";
+export * from "../config/v2/tableShorthand";
+export * from "../config/v2/namespace";
+export * from "../config/v2/namespaces";
+export * from "../config/v2/scope";
+export * from "../config/v2/flattenNamespacedTables";

packages/store/tsup.config.ts

@@ -6,7 +6,6 @@ export default defineConfig((opts) => ({
     index: "ts/exports/index.ts",
     internal: "ts/exports/internal.ts",
     codegen: "ts/codegen/index.ts",
-    "config/v2": "ts/config/v2/index.ts",
   },
   target: "esnext",
   format: ["esm"],

packages/world/package.json

@@ -13,7 +13,6 @@
     ".": "./dist/index.js",
     "./internal": "./dist/internal.js",
     "./mud.config": "./dist/mud.config.js",
-    "./config/v2": "./dist/config/v2.js",
     "./node": "./dist/node.js",
     "./out/*": "./out/*"
   },
@@ -28,9 +27,6 @@
       "mud.config": [
         "./dist/mud.config.d.ts"
       ],
-      "config/v2": [
-        "./dist/config/v2.d.ts"
-      ],
       "node": [
         "./dist/node.d.ts"
       ]

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

@@ -1,4 +1,4 @@
-import { isObject, mergeIfUndefined } from "@latticexyz/store/config/v2";
+import { isObject, mergeIfUndefined } from "@latticexyz/store/internal";
 import { CODEGEN_DEFAULTS } from "./defaults";
 
 export type resolveCodegen<codegen> = codegen extends {}

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

@@ -1,4 +1,4 @@
-import { mergeIfUndefined, isObject } from "@latticexyz/store/config/v2";
+import { mergeIfUndefined, isObject } from "@latticexyz/store/internal";
 import { DEPLOY_DEFAULTS } from "./defaults";
 
 export type resolveDeploy<deploy> = deploy extends {} ? mergeIfUndefined<deploy, DEPLOY_DEFAULTS> : DEPLOY_DEFAULTS;

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

@@ -1,4 +1,4 @@
-import { StoreInput, NamespaceInput as StoreNamespaceInput } from "@latticexyz/store/config/v2";
+import { StoreInput, NamespaceInput as StoreNamespaceInput } from "@latticexyz/store/internal";
 import { DynamicResolution, ValueWithType } from "./dynamicResolution";
 import { Codegen, SystemDeploy } from "./output";
 

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

@@ -5,7 +5,7 @@ import {
   resolveNamespace as resolveStoreNamespace,
   Scope,
   AbiTypeScope,
-} from "@latticexyz/store/config/v2";
+} from "@latticexyz/store/internal";
 import { resolveSystems, validateSystems } from "./systems";
 import { show } from "@ark/util";
 

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

@@ -2,7 +2,7 @@ import { show, flatMorph } from "@ark/util";
 import { NamespacesInput } from "./input";
 import { validateNamespace, resolveNamespace } from "./namespace";
 import { groupBy } from "@latticexyz/common/utils";
-import { AbiTypeScope, Scope, isObject, mergeIfUndefined } from "@latticexyz/store/config/v2";
+import { AbiTypeScope, Scope, isObject, mergeIfUndefined } from "@latticexyz/store/internal";
 
 // Copied from store/ts/config/v2/namespaces.ts but using world namespace validate/resolve methods
 // TODO: figure out how to dedupe these?

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

@@ -1,5 +1,5 @@
 import { Store } from "@latticexyz/store";
-import { Namespace as StoreNamespace } from "@latticexyz/store/config/v2";
+import { Namespace as StoreNamespace } from "@latticexyz/store/internal";
 import { DynamicResolution, ValueWithType } from "./dynamicResolution";
 import { Hex } from "viem";
 

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

@@ -1,6 +1,6 @@
 import { SYSTEM_DEFAULTS, SYSTEM_DEPLOY_DEFAULTS } from "./defaults";
 import { SystemInput } from "./input";
-import { hasOwnKey, mergeIfUndefined } from "@latticexyz/store/config/v2";
+import { hasOwnKey, mergeIfUndefined } from "@latticexyz/store/internal";
 import { ErrorMessage, narrow, requiredKeyOf, show } from "@ark/util";
 import { Hex } from "viem";
 import { resourceToHex } from "@latticexyz/common";

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

@@ -1,5 +1,5 @@
 import { ErrorMessage } from "@ark/util";
-import { isObject } from "@latticexyz/store/config/v2";
+import { isObject } from "@latticexyz/store/internal";
 import { SystemsInput } from "./input";
 import { resolveSystem, validateSystem } from "./system";
 

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

@@ -8,15 +8,15 @@ import {
   validateStore,
   flattenNamespacedTables,
   CONFIG_DEFAULTS as STORE_CONFIG_DEFAULTS,
-} from "@latticexyz/store/config/v2";
+} from "@latticexyz/store/internal";
 import { SystemsInput, WorldInput } from "./input";
 import { CONFIG_DEFAULTS, MODULE_DEFAULTS } from "./defaults";
 import { resolveSystems, validateSystems } from "./systems";
 import { resolveNamespaces, validateNamespaces } from "./namespaces";
 import { resolveCodegen } from "./codegen";
 import { resolveDeploy } from "./deploy";
 import type { World } from "./output.js";
-import { StoreInput } from "@latticexyz/store/config/v2";
+import { StoreInput } from "@latticexyz/store";
 
 export type validateWorld<input> = {
   readonly [key in keyof input]: key extends "namespaces"

packages/world/tsup.config.ts

@@ -5,7 +5,6 @@ export default defineConfig((opts) => ({
     "mud.config": "mud.config.ts",
     index: "ts/exports/index.ts",
     internal: "ts/exports/internal.ts",
-    "config/v2": "ts/config/v2/index.ts",
     node: "ts/node/index.ts",
   },
   target: "esnext",

tsconfig.paths.json

@@ -31,15 +31,13 @@
       "@latticexyz/store": ["./packages/store/ts/exports/index.ts"],
       "@latticexyz/store/mud.config": ["./packages/store/mud.config.ts"],
       "@latticexyz/store/codegen": ["./packages/store/ts/codegen/index.ts"],
-      "@latticexyz/store/config/v2": ["./packages/store/ts/config/v2/index.ts"],
       "@latticexyz/store/out/*": ["./packages/store/out/*"],
       "@latticexyz/store/*": ["./packages/store/ts/exports/*.ts"],
       "@latticexyz/store-sync": ["./packages/store-sync/src/index.ts"],
       "@latticexyz/store-sync/*": ["./packages/store-sync/src/*"],
       "@latticexyz/utils": ["./packages/utils/src/index.ts"],
       "@latticexyz/world": ["./packages/world/ts/exports/index.ts"],
       "@latticexyz/world/mud.config": ["./packages/world/mud.config.ts"],
-      "@latticexyz/world/config/v2": ["./packages/world/ts/config/v2/index.ts"],
       "@latticexyz/world/node": ["./packages/world/ts/node/index.ts"],
       "@latticexyz/world/out/*": ["./packages/world/out/*"],
       "@latticexyz/world/*": ["./packages/world/ts/exports/*.ts"],