add v2 config to v1 world compat

latticexyz · Mar 20, 2024 · 25ef52f · 25ef52f
1 parent cb88ed0
commit 25ef52f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/store/ts/config/v2/compat.test.ts b/packages/store/ts/config/v2/compat.test.ts
@@ -89,10 +89,10 @@ describe("configToV1", () => {
       },
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { v2: _, ...v1FromV2 } = storeToV1(configV2);
+    const { v2, ...v1FromV2 } = storeToV1(configV2);
 
     attest<typeof configV1>(v1FromV2).equals(configV1);
-    attest<Omit<storeToV1<typeof configV2>, "v2">>(configV1);
+    attest<typeof v1FromV2>(configV1).equals(v1FromV2);
+    attest<typeof configV2>(v2).equals(configV2);
   });
 });
diff --git a/packages/world/ts/config/v2/compat.test.ts b/packages/world/ts/config/v2/compat.test.ts
@@ -10,8 +10,8 @@ import { defineWorld } from "./world";
 describe("configToV1", () => {
   it("should transform the broad v2 output to the broad v1 output", () => {
     // Making the `worldContractName` prop required here since it is required on the output of `mudConfig`
-    attest<WorldConfigV1 & StoreConfigV1 & { worldContractName: string | undefined }, worldToV1<World>>();
-    attest<worldToV1<World>, WorldConfigV1 & StoreConfigV1 & { worldContractName: string | undefined }>();
+    attest<WorldConfigV1 & StoreConfigV1 & { worldContractName: string | undefined }, Omit<worldToV1<World>, "v2">>();
+    attest<Omit<worldToV1<World>, "v2">, WorldConfigV1 & StoreConfigV1 & { worldContractName: string | undefined }>();
   });
 
   it("should transform a v2 store config output to the v1 config output", () => {
@@ -90,7 +90,10 @@ describe("configToV1", () => {
       },
     });
 
-    attest<typeof configV1>(worldToV1(configV2)).equals(configV1);
-    attest<worldToV1<typeof configV2>>(configV1);
+    const { v2, ...v1FromV2 } = worldToV1(configV2);
+
+    attest<typeof configV1>(v1FromV2).equals(configV1);
+    attest<typeof v1FromV2>(configV1).equals(v1FromV2);
+    attest<typeof v2>(configV2).equals(v2);
   });
 });
diff --git a/packages/world/ts/config/v2/compat.ts b/packages/world/ts/config/v2/compat.ts
@@ -26,7 +26,7 @@ function systemsToV1<systems extends Systems>(systems: systems): systemsToV1<sys
 }
 
 export type worldToV1<world> = world extends World
-  ? storeToV1<world> & {
+  ? Omit<storeToV1<world>, "v2"> & {
       systems: systemsToV1<world["systems"]>;
       excludeSystems: mutable<world["excludeSystems"]>;
       modules: modulesToV1<world["modules"]>;
@@ -37,6 +37,7 @@ export type worldToV1<world> = world extends World
       worldInterfaceName: world["codegen"]["worldInterfaceName"];
       worldgenDirectory: world["codegen"]["worldgenDirectory"];
       worldImportPath: world["codegen"]["worldImportPath"];
+      v2: world;
     }
   : never;
 
@@ -54,5 +55,5 @@ export function worldToV1<world>(world: conform<world, World>): worldToV1<world>
     worldImportPath: world.codegen.worldImportPath,
   };
 
-  return { ...storeToV1(world as Store), ...v1WorldConfig } as worldToV1<world>;
+  return { ...storeToV1(world as Store), ...v1WorldConfig, v2: world } as worldToV1<world>;
 }