@latticexyz/world 2.0.0-main-07e12ea2 → 2.0.0-main-20ffc95f

package/dist/ts/config/v2/index.d.ts

@@ -42,7 +42,7 @@ type System = {
 type Systems = {
     readonly [key: string]: System;
 };
-type Deployment = {
+type Deploy = {
     /** The name of a custom World contract to deploy. If no name is provided, a default MUD World is deployed */
     readonly customWorldContract: string | undefined;
     /**
@@ -69,8 +69,8 @@ type World = Store & {
     readonly excludeSystems: readonly string[];
     /** Modules to in the World */
     readonly modules: readonly Module[];
-    /** Deployment config */
-    readonly deployment: Deployment;
+    /** Deploy config */
+    readonly deploy: Deploy;
     /** Codegen config */
     readonly codegen: Codegen;
 };
@@ -94,7 +94,7 @@ type SystemInput = {
 type SystemsInput = {
     [key: string]: SystemInput;
 };
-type DeploymentInput = {
+type DeployInput = {
     /**
      * Script to execute after the deployment is complete (Default "PostDeploy").
      * Script must be placed in the forge scripts directory (see foundry.toml) and have a ".s.sol" extension.
@@ -127,8 +127,8 @@ type WorldInput = evaluate<StoreInput & {
     excludeSystems?: string[];
     /** Modules to in the World */
     modules?: Module[];
-    /** Deployment config */
-    deployment?: DeploymentInput;
+    /** Deploy config */
+    deploy?: DeployInput;
     /** Codegen config */
     codegen?: CodegenInput;
 }>;
@@ -142,7 +142,7 @@ declare const CODEGEN_DEFAULTS: {
     readonly worldgenDirectory: "world";
     readonly worldImportPath: "@latticexyz/world/src/";
 };
-declare const DEPLOYMENT_DEFAULTS: {
+declare const DEPLOY_DEFAULTS: {
     readonly customWorldContract: undefined;
     readonly postDeployScript: "PostDeploy";
     readonly deploysDirectory: "./deploys";
@@ -158,7 +158,7 @@ declare const CONFIG_DEFAULTS: {
         readonly worldgenDirectory: "world";
         readonly worldImportPath: "@latticexyz/world/src/";
     };
-    readonly deployment: {
+    readonly deploy: {
         readonly customWorldContract: undefined;
         readonly postDeployScript: "PostDeploy";
         readonly deploysDirectory: "./deploys";
@@ -188,8 +188,8 @@ type resolveNamespacedTables<world> = "namespaces" extends keyof world ? {
 type resolveCodegen<codegen> = codegen extends {} ? mergeIfUndefined<codegen, typeof CODEGEN_DEFAULTS> : typeof CODEGEN_DEFAULTS;
 declare function resolveCodegen<codegen>(codegen: codegen): resolveCodegen<codegen>;
 
-type resolveDeployment<deployment> = deployment extends {} ? mergeIfUndefined<deployment, typeof DEPLOYMENT_DEFAULTS> : typeof DEPLOYMENT_DEFAULTS;
-declare function resolveDeployment<deployment>(deployment: deployment): resolveDeployment<deployment>;
+type resolveDeploy<deploy> = deploy extends {} ? mergeIfUndefined<deploy, typeof DEPLOY_DEFAULTS> : typeof DEPLOY_DEFAULTS;
+declare function resolveDeploy<deploy>(deploy: deploy): resolveDeploy<deploy>;
 
 type validateWorld<world> = {
     readonly [key in keyof world]: key extends "tables" ? validateTables<world[key], extendedScope<world>> : key extends "userTypes" ? UserTypes : key extends "enums" ? narrow<world[key]> : key extends "namespaces" ? validateNamespaces<world[key], extendedScope<world>> : key extends keyof WorldInput ? conform<world[key], WorldInput[key]> : world[key];
@@ -198,9 +198,9 @@ declare function validateWorld(world: unknown): asserts world is WorldInput;
 type resolveWorld<world> = evaluate<resolveStore<world> & mergeIfUndefined<{
     tables: resolveNamespacedTables<world>;
 } & Omit<{
-    [key in keyof world]: key extends "systems" ? resolveSystems<world[key] & SystemsInput> : key extends "deployment" ? resolveDeployment<world[key]> : key extends "codegen" ? resolveCodegen<world[key]> : world[key];
+    [key in keyof world]: key extends "systems" ? resolveSystems<world[key] & SystemsInput> : key extends "deploy" ? resolveDeploy<world[key]> : key extends "codegen" ? resolveCodegen<world[key]> : world[key];
 }, "namespaces" | keyof Store>, typeof CONFIG_DEFAULTS>>;
 declare function resolveWorld<const world extends WorldInput>(world: world): resolveWorld<world>;
 declare function defineWorld<const world>(world: validateWorld<world>): resolveWorld<world>;
 
-export { Codegen, Deployment, Module, System, Systems, World, defineWorld, resolveWorld, validateWorld };
+export { Codegen, Deploy, Module, System, Systems, World, defineWorld, resolveWorld, validateWorld };

package/dist/ts/config/v2/index.js

@@ -1,2 +1,2 @@
-import{a as y}from"../../../chunk-RF4HOV37.js";import{extendedScope as v,get as I,resolveTable as U,validateTable as b,mergeIfUndefined as l,validateTables as O,resolveStore as F,hasOwnKey as S,validateStore as L,isObject as N}from"@latticexyz/store/config/v2";var t={worldInterfaceName:"IWorld",worldgenDirectory:"world",worldImportPath:"@latticexyz/world/src/"},r={customWorldContract:void 0,postDeployScript:"PostDeploy",deploysDirectory:"./deploys",worldsFile:"./worlds.json"},d={systems:{},tables:{},excludeSystems:[],modules:[],codegen:t,deployment:r};import{mapObject as E}from"@latticexyz/common/utils";import{mergeIfUndefined as T}from"@latticexyz/store/config/v2";function c(e){return E(e,o=>T(o,y))}import{isObject as D,mergeIfUndefined as g}from"@latticexyz/store/config/v2";function i(e){return D(e)?g(e,t):t}import{mergeIfUndefined as k,isObject as w}from"@latticexyz/store/config/v2";function f(e){return w(e)?k(e,r):r}function W(e){let o=v(e);if(L(e),S(e,"namespaces")){if(!N(e.namespaces))throw new Error(`Expected namespaces, received ${JSON.stringify(e.namespaces)}`);for(let s of Object.values(e.namespaces))S(s,"tables")&&O(s.tables,o)}}function _(e){let o=v(e),s=e.namespaces??{},u=Object.fromEntries(Object.entries(s).map(([m,x])=>Object.entries(x.tables).map(([p,a])=>(b(a,o),[`${m}__${p}`,U(l(a,{namespace:m,name:p}),o)]))).flat()),n=F(e);return l({...n,tables:{...n.tables,...u},codegen:l(n.codegen,i(e.codegen)),deployment:f(e.deployment),systems:c(e.systems??d.systems),excludeSystems:I(e,"excludeSystems"),modules:e.modules},d)}function Z(e){return W(e),_(e)}export{Z as defineWorld,_ as resolveWorld,W as validateWorld};
+import{a as y}from"../../../chunk-RF4HOV37.js";import{extendedScope as v,get as I,resolveTable as U,validateTable as b,mergeIfUndefined as l,validateTables as O,resolveStore as F,hasOwnKey as S,validateStore as L,isObject as W}from"@latticexyz/store/config/v2";var t={worldInterfaceName:"IWorld",worldgenDirectory:"world",worldImportPath:"@latticexyz/world/src/"},r={customWorldContract:void 0,postDeployScript:"PostDeploy",deploysDirectory:"./deploys",worldsFile:"./worlds.json"},d={systems:{},tables:{},excludeSystems:[],modules:[],codegen:t,deploy:r};import{mapObject as D}from"@latticexyz/common/utils";import{mergeIfUndefined as E}from"@latticexyz/store/config/v2";function c(e){return D(e,o=>E(o,y))}import{isObject as g,mergeIfUndefined as T}from"@latticexyz/store/config/v2";function i(e){return g(e)?T(e,t):t}import{mergeIfUndefined as k,isObject as w}from"@latticexyz/store/config/v2";function f(e){return w(e)?k(e,r):r}function _(e){let o=v(e);if(L(e),S(e,"namespaces")){if(!W(e.namespaces))throw new Error(`Expected namespaces, received ${JSON.stringify(e.namespaces)}`);for(let s of Object.values(e.namespaces))S(s,"tables")&&O(s.tables,o)}}function A(e){let o=v(e),s=e.namespaces??{},u=Object.fromEntries(Object.entries(s).map(([p,x])=>Object.entries(x.tables??{}).map(([m,a])=>(b(a,o),[`${p}__${m}`,U(l(a,{namespace:p,name:m}),o)]))).flat()),n=F(e);return l({...n,tables:{...n.tables,...u},codegen:l(n.codegen,i(e.codegen)),deploy:f(e.deploy),systems:c(e.systems??d.systems),excludeSystems:I(e,"excludeSystems"),modules:e.modules},d)}function Z(e){return _(e),A(e)}export{Z as defineWorld,A as resolveWorld,_ as validateWorld};
 //# sourceMappingURL=index.js.map

package/dist/ts/config/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../ts/config/v2/world.ts","../../../../ts/config/v2/defaults.ts","../../../../ts/config/v2/systems.ts","../../../../ts/config/v2/codegen.ts","../../../../ts/config/v2/deployment.ts"],"sourcesContent":["import { conform, evaluate, narrow } from \"@arktype/util\";\nimport {\n  UserTypes,\n  extendedScope,\n  get,\n  resolveTable,\n  validateTable,\n  mergeIfUndefined,\n  validateTables,\n  resolveStore,\n  Store,\n  hasOwnKey,\n  validateStore,\n  isObject,\n} from \"@latticexyz/store/config/v2\";\nimport { SystemsInput, WorldInput } from \"./input\";\nimport { CONFIG_DEFAULTS } from \"./defaults\";\nimport { Tables } from \"@latticexyz/store\";\nimport { resolveSystems } from \"./systems\";\nimport { resolveNamespacedTables, validateNamespaces } from \"./namespaces\";\nimport { resolveCodegen } from \"./codegen\";\nimport { resolveDeployment } from \"./deployment\";\n\nexport type validateWorld<world> = {\n  readonly [key in keyof world]: key extends \"tables\"\n    ? validateTables<world[key], extendedScope<world>>\n    : key extends \"userTypes\"\n      ? UserTypes\n      : key extends \"enums\"\n        ? narrow<world[key]>\n        : key extends \"namespaces\"\n          ? validateNamespaces<world[key], extendedScope<world>>\n          : key extends keyof WorldInput\n            ? conform<world[key], WorldInput[key]>\n            : world[key];\n};\n\nexport function validateWorld(world: unknown): asserts world is WorldInput {\n  const scope = extendedScope(world);\n  validateStore(world);\n\n  if (hasOwnKey(world, \"namespaces\")) {\n    if (!isObject(world.namespaces)) {\n      throw new Error(`Expected namespaces, received ${JSON.stringify(world.namespaces)}`);\n    }\n    for (const namespace of Object.values(world.namespaces)) {\n      if (hasOwnKey(namespace, \"tables\")) {\n        validateTables(namespace.tables, scope);\n      }\n    }\n  }\n}\n\nexport type resolveWorld<world> = evaluate<\n  resolveStore<world> &\n    mergeIfUndefined<\n      { tables: resolveNamespacedTables<world> } & Omit<\n        {\n          [key in keyof world]: key extends \"systems\"\n            ? resolveSystems<world[key] & SystemsInput>\n            : key extends \"deployment\"\n              ? resolveDeployment<world[key]>\n              : key extends \"codegen\"\n                ? resolveCodegen<world[key]>\n                : world[key];\n        },\n        \"namespaces\" | keyof Store\n      >,\n      typeof CONFIG_DEFAULTS\n    >\n>;\n\nexport function resolveWorld<const world extends WorldInput>(world: world): resolveWorld<world> {\n  const scope = extendedScope(world);\n  const namespaces = world.namespaces ?? {};\n\n  const resolvedNamespacedTables = Object.fromEntries(\n    Object.entries(namespaces)\n      .map(([namespaceKey, namespace]) =>\n        Object.entries(namespace.tables).map(([tableKey, table]) => {\n          validateTable(table, scope);\n          return [\n            `${namespaceKey}__${tableKey}`,\n            resolveTable(mergeIfUndefined(table, { namespace: namespaceKey, name: tableKey }), scope),\n          ];\n        }),\n      )\n      .flat(),\n  ) as Tables;\n\n  const resolvedStore = resolveStore(world);\n\n  return mergeIfUndefined(\n    {\n      ...resolvedStore,\n      tables: { ...resolvedStore.tables, ...resolvedNamespacedTables },\n      codegen: mergeIfUndefined(resolvedStore.codegen, resolveCodegen(world.codegen)),\n      deployment: resolveDeployment(world.deployment),\n      systems: resolveSystems(world.systems ?? CONFIG_DEFAULTS.systems),\n      excludeSystems: get(world, \"excludeSystems\"),\n      modules: world.modules,\n    },\n    CONFIG_DEFAULTS,\n  ) as unknown as resolveWorld<world>;\n}\n\nexport function defineWorld<const world>(world: validateWorld<world>): resolveWorld<world> {\n  validateWorld(world);\n  return resolveWorld(world) as unknown as resolveWorld<world>;\n}\n","export const SYSTEM_DEFAULTS = {\n  registerFunctionSelectors: true,\n  openAccess: true,\n  accessList: [] as string[],\n} as const;\n\nexport const CODEGEN_DEFAULTS = {\n  worldInterfaceName: \"IWorld\",\n  worldgenDirectory: \"world\",\n  worldImportPath: \"@latticexyz/world/src/\",\n} as const;\n\nexport const DEPLOYMENT_DEFAULTS = {\n  customWorldContract: undefined,\n  postDeployScript: \"PostDeploy\",\n  deploysDirectory: \"./deploys\",\n  worldsFile: \"./worlds.json\",\n} as const;\n\nexport const CONFIG_DEFAULTS = {\n  systems: {},\n  tables: {},\n  excludeSystems: [] as string[],\n  modules: [],\n  codegen: CODEGEN_DEFAULTS,\n  deployment: DEPLOYMENT_DEFAULTS,\n} as const;\n","import { mapObject } from \"@latticexyz/common/utils\";\nimport { SYSTEM_DEFAULTS } from \"../defaults\";\nimport { SystemsInput } from \"./input\";\nimport { mergeIfUndefined } from \"@latticexyz/store/config/v2\";\n\nexport type resolveSystems<systems extends SystemsInput> = {\n  [system in keyof systems]: mergeIfUndefined<systems[system], typeof SYSTEM_DEFAULTS>;\n};\n\nexport function resolveSystems<systems extends SystemsInput>(systems: systems): resolveSystems<systems> {\n  return mapObject(systems, (system) => mergeIfUndefined(system, SYSTEM_DEFAULTS));\n}\n","import { isObject, mergeIfUndefined } from \"@latticexyz/store/config/v2\";\nimport { CODEGEN_DEFAULTS } from \"./defaults\";\n\nexport type resolveCodegen<codegen> = codegen extends {}\n  ? mergeIfUndefined<codegen, typeof CODEGEN_DEFAULTS>\n  : typeof CODEGEN_DEFAULTS;\n\nexport function resolveCodegen<codegen>(codegen: codegen): resolveCodegen<codegen> {\n  return (\n    isObject(codegen) ? mergeIfUndefined(codegen, CODEGEN_DEFAULTS) : CODEGEN_DEFAULTS\n  ) as resolveCodegen<codegen>;\n}\n","import { mergeIfUndefined, isObject } from \"@latticexyz/store/config/v2\";\nimport { DEPLOYMENT_DEFAULTS } from \"./defaults\";\n\nexport type resolveDeployment<deployment> = deployment extends {}\n  ? mergeIfUndefined<deployment, typeof DEPLOYMENT_DEFAULTS>\n  : typeof DEPLOYMENT_DEFAULTS;\n\nexport function resolveDeployment<deployment>(deployment: deployment): resolveDeployment<deployment> {\n  return (\n    isObject(deployment) ? mergeIfUndefined(deployment, DEPLOYMENT_DEFAULTS) : DEPLOYMENT_DEFAULTS\n  ) as resolveDeployment<deployment>;\n}\n"],"mappings":"+CACA,OAEE,iBAAAA,EACA,OAAAC,EACA,gBAAAC,EACA,iBAAAC,EACA,oBAAAC,EACA,kBAAAC,EACA,gBAAAC,EAEA,aAAAC,EACA,iBAAAC,EACA,YAAAC,MACK,8BCRA,IAAMC,EAAmB,CAC9B,mBAAoB,SACpB,kBAAmB,QACnB,gBAAiB,wBACnB,EAEaC,EAAsB,CACjC,oBAAqB,OACrB,iBAAkB,aAClB,iBAAkB,YAClB,WAAY,eACd,EAEaC,EAAkB,CAC7B,QAAS,CAAC,EACV,OAAQ,CAAC,EACT,eAAgB,CAAC,EACjB,QAAS,CAAC,EACV,QAASF,EACT,WAAYC,CACd,EC1BA,OAAS,aAAAE,MAAiB,2BAG1B,OAAS,oBAAAC,MAAwB,8BAM1B,SAASC,EAA6CC,EAA2C,CACtG,OAAOC,EAAUD,EAAUE,GAAWJ,EAAiBI,EAAQC,CAAe,CAAC,CACjF,CCXA,OAAS,YAAAC,EAAU,oBAAAC,MAAwB,8BAOpC,SAASC,EAAwBC,EAA2C,CACjF,OACEC,EAASD,CAAO,EAAIE,EAAiBF,EAASG,CAAgB,EAAIA,CAEtE,CCXA,OAAS,oBAAAC,EAAkB,YAAAC,MAAgB,8BAOpC,SAASC,EAA8BC,EAAuD,CACnG,OACEC,EAASD,CAAU,EAAIE,EAAiBF,EAAYG,CAAmB,EAAIA,CAE/E,CJ0BO,SAASC,EAAcC,EAA6C,CACzE,IAAMC,EAAQC,EAAcF,CAAK,EAGjC,GAFAG,EAAcH,CAAK,EAEfI,EAAUJ,EAAO,YAAY,EAAG,CAClC,GAAI,CAACK,EAASL,EAAM,UAAU,EAC5B,MAAM,IAAI,MAAM,iCAAiC,KAAK,UAAUA,EAAM,UAAU,GAAG,EAErF,QAAWM,KAAa,OAAO,OAAON,EAAM,UAAU,EAChDI,EAAUE,EAAW,QAAQ,GAC/BC,EAAeD,EAAU,OAAQL,CAAK,EAI9C,CAqBO,SAASO,EAA6CR,EAAmC,CAC9F,IAAMC,EAAQC,EAAcF,CAAK,EAC3BS,EAAaT,EAAM,YAAc,CAAC,EAElCU,EAA2B,OAAO,YACtC,OAAO,QAAQD,CAAU,EACtB,IAAI,CAAC,CAACE,EAAcL,CAAS,IAC5B,OAAO,QAAQA,EAAU,MAAM,EAAE,IAAI,CAAC,CAACM,EAAUC,CAAK,KACpDC,EAAcD,EAAOZ,CAAK,EACnB,CACL,GAAGU,MAAiBC,IACpBG,EAAaC,EAAiBH,EAAO,CAAE,UAAWF,EAAc,KAAMC,CAAS,CAAC,EAAGX,CAAK,CAC1F,EACD,CACH,EACC,KAAK,CACV,EAEMgB,EAAgBC,EAAalB,CAAK,EAExC,OAAOgB,EACL,CACE,GAAGC,EACH,OAAQ,CAAE,GAAGA,EAAc,OAAQ,GAAGP,CAAyB,EAC/D,QAASM,EAAiBC,EAAc,QAASE,EAAenB,EAAM,OAAO,CAAC,EAC9E,WAAYoB,EAAkBpB,EAAM,UAAU,EAC9C,QAASqB,EAAerB,EAAM,SAAWsB,EAAgB,OAAO,EAChE,eAAgBC,EAAIvB,EAAO,gBAAgB,EAC3C,QAASA,EAAM,OACjB,EACAsB,CACF,CACF,CAEO,SAASE,EAAyBxB,EAAkD,CACzF,OAAAD,EAAcC,CAAK,EACZQ,EAAaR,CAAK,CAC3B","names":["extendedScope","get","resolveTable","validateTable","mergeIfUndefined","validateTables","resolveStore","hasOwnKey","validateStore","isObject","CODEGEN_DEFAULTS","DEPLOYMENT_DEFAULTS","CONFIG_DEFAULTS","mapObject","mergeIfUndefined","resolveSystems","systems","mapObject","system","SYSTEM_DEFAULTS","isObject","mergeIfUndefined","resolveCodegen","codegen","isObject","mergeIfUndefined","CODEGEN_DEFAULTS","mergeIfUndefined","isObject","resolveDeployment","deployment","isObject","mergeIfUndefined","DEPLOYMENT_DEFAULTS","validateWorld","world","scope","extendedScope","validateStore","hasOwnKey","isObject","namespace","validateTables","resolveWorld","namespaces","resolvedNamespacedTables","namespaceKey","tableKey","table","validateTable","resolveTable","mergeIfUndefined","resolvedStore","resolveStore","resolveCodegen","resolveDeployment","resolveSystems","CONFIG_DEFAULTS","get","defineWorld"]}
+{"version":3,"sources":["../../../../ts/config/v2/world.ts","../../../../ts/config/v2/defaults.ts","../../../../ts/config/v2/systems.ts","../../../../ts/config/v2/codegen.ts","../../../../ts/config/v2/deploy.ts"],"sourcesContent":["import { conform, evaluate, narrow } from \"@arktype/util\";\nimport {\n  UserTypes,\n  extendedScope,\n  get,\n  resolveTable,\n  validateTable,\n  mergeIfUndefined,\n  validateTables,\n  resolveStore,\n  Store,\n  hasOwnKey,\n  validateStore,\n  isObject,\n} from \"@latticexyz/store/config/v2\";\nimport { SystemsInput, WorldInput } from \"./input\";\nimport { CONFIG_DEFAULTS } from \"./defaults\";\nimport { Tables } from \"@latticexyz/store\";\nimport { resolveSystems } from \"./systems\";\nimport { resolveNamespacedTables, validateNamespaces } from \"./namespaces\";\nimport { resolveCodegen } from \"./codegen\";\nimport { resolveDeploy } from \"./deploy\";\n\nexport type validateWorld<world> = {\n  readonly [key in keyof world]: key extends \"tables\"\n    ? validateTables<world[key], extendedScope<world>>\n    : key extends \"userTypes\"\n      ? UserTypes\n      : key extends \"enums\"\n        ? narrow<world[key]>\n        : key extends \"namespaces\"\n          ? validateNamespaces<world[key], extendedScope<world>>\n          : key extends keyof WorldInput\n            ? conform<world[key], WorldInput[key]>\n            : world[key];\n};\n\nexport function validateWorld(world: unknown): asserts world is WorldInput {\n  const scope = extendedScope(world);\n  validateStore(world);\n\n  if (hasOwnKey(world, \"namespaces\")) {\n    if (!isObject(world.namespaces)) {\n      throw new Error(`Expected namespaces, received ${JSON.stringify(world.namespaces)}`);\n    }\n    for (const namespace of Object.values(world.namespaces)) {\n      if (hasOwnKey(namespace, \"tables\")) {\n        validateTables(namespace.tables, scope);\n      }\n    }\n  }\n}\n\nexport type resolveWorld<world> = evaluate<\n  resolveStore<world> &\n    mergeIfUndefined<\n      { tables: resolveNamespacedTables<world> } & Omit<\n        {\n          [key in keyof world]: key extends \"systems\"\n            ? resolveSystems<world[key] & SystemsInput>\n            : key extends \"deploy\"\n              ? resolveDeploy<world[key]>\n              : key extends \"codegen\"\n                ? resolveCodegen<world[key]>\n                : world[key];\n        },\n        \"namespaces\" | keyof Store\n      >,\n      typeof CONFIG_DEFAULTS\n    >\n>;\n\nexport function resolveWorld<const world extends WorldInput>(world: world): resolveWorld<world> {\n  const scope = extendedScope(world);\n  const namespaces = world.namespaces ?? {};\n\n  const resolvedNamespacedTables = Object.fromEntries(\n    Object.entries(namespaces)\n      .map(([namespaceKey, namespace]) =>\n        Object.entries(namespace.tables ?? {}).map(([tableKey, table]) => {\n          validateTable(table, scope);\n          return [\n            `${namespaceKey}__${tableKey}`,\n            resolveTable(mergeIfUndefined(table, { namespace: namespaceKey, name: tableKey }), scope),\n          ];\n        }),\n      )\n      .flat(),\n  ) as Tables;\n\n  const resolvedStore = resolveStore(world);\n\n  return mergeIfUndefined(\n    {\n      ...resolvedStore,\n      tables: { ...resolvedStore.tables, ...resolvedNamespacedTables },\n      codegen: mergeIfUndefined(resolvedStore.codegen, resolveCodegen(world.codegen)),\n      deploy: resolveDeploy(world.deploy),\n      systems: resolveSystems(world.systems ?? CONFIG_DEFAULTS.systems),\n      excludeSystems: get(world, \"excludeSystems\"),\n      modules: world.modules,\n    },\n    CONFIG_DEFAULTS,\n  ) as unknown as resolveWorld<world>;\n}\n\nexport function defineWorld<const world>(world: validateWorld<world>): resolveWorld<world> {\n  validateWorld(world);\n  return resolveWorld(world) as unknown as resolveWorld<world>;\n}\n","export const SYSTEM_DEFAULTS = {\n  registerFunctionSelectors: true,\n  openAccess: true,\n  accessList: [] as string[],\n} as const;\n\nexport const CODEGEN_DEFAULTS = {\n  worldInterfaceName: \"IWorld\",\n  worldgenDirectory: \"world\",\n  worldImportPath: \"@latticexyz/world/src/\",\n} as const;\n\nexport const DEPLOY_DEFAULTS = {\n  customWorldContract: undefined,\n  postDeployScript: \"PostDeploy\",\n  deploysDirectory: \"./deploys\",\n  worldsFile: \"./worlds.json\",\n} as const;\n\nexport const CONFIG_DEFAULTS = {\n  systems: {},\n  tables: {},\n  excludeSystems: [] as string[],\n  modules: [],\n  codegen: CODEGEN_DEFAULTS,\n  deploy: DEPLOY_DEFAULTS,\n} as const;\n","import { mapObject } from \"@latticexyz/common/utils\";\nimport { SYSTEM_DEFAULTS } from \"../defaults\";\nimport { SystemsInput } from \"./input\";\nimport { mergeIfUndefined } from \"@latticexyz/store/config/v2\";\n\nexport type resolveSystems<systems extends SystemsInput> = {\n  [system in keyof systems]: mergeIfUndefined<systems[system], typeof SYSTEM_DEFAULTS>;\n};\n\nexport function resolveSystems<systems extends SystemsInput>(systems: systems): resolveSystems<systems> {\n  return mapObject(systems, (system) => mergeIfUndefined(system, SYSTEM_DEFAULTS));\n}\n","import { isObject, mergeIfUndefined } from \"@latticexyz/store/config/v2\";\nimport { CODEGEN_DEFAULTS } from \"./defaults\";\n\nexport type resolveCodegen<codegen> = codegen extends {}\n  ? mergeIfUndefined<codegen, typeof CODEGEN_DEFAULTS>\n  : typeof CODEGEN_DEFAULTS;\n\nexport function resolveCodegen<codegen>(codegen: codegen): resolveCodegen<codegen> {\n  return (\n    isObject(codegen) ? mergeIfUndefined(codegen, CODEGEN_DEFAULTS) : CODEGEN_DEFAULTS\n  ) as resolveCodegen<codegen>;\n}\n","import { mergeIfUndefined, isObject } from \"@latticexyz/store/config/v2\";\nimport { DEPLOY_DEFAULTS } from \"./defaults\";\n\nexport type resolveDeploy<deploy> = deploy extends {}\n  ? mergeIfUndefined<deploy, typeof DEPLOY_DEFAULTS>\n  : typeof DEPLOY_DEFAULTS;\n\nexport function resolveDeploy<deploy>(deploy: deploy): resolveDeploy<deploy> {\n  return (isObject(deploy) ? mergeIfUndefined(deploy, DEPLOY_DEFAULTS) : DEPLOY_DEFAULTS) as resolveDeploy<deploy>;\n}\n"],"mappings":"+CACA,OAEE,iBAAAA,EACA,OAAAC,EACA,gBAAAC,EACA,iBAAAC,EACA,oBAAAC,EACA,kBAAAC,EACA,gBAAAC,EAEA,aAAAC,EACA,iBAAAC,EACA,YAAAC,MACK,8BCRA,IAAMC,EAAmB,CAC9B,mBAAoB,SACpB,kBAAmB,QACnB,gBAAiB,wBACnB,EAEaC,EAAkB,CAC7B,oBAAqB,OACrB,iBAAkB,aAClB,iBAAkB,YAClB,WAAY,eACd,EAEaC,EAAkB,CAC7B,QAAS,CAAC,EACV,OAAQ,CAAC,EACT,eAAgB,CAAC,EACjB,QAAS,CAAC,EACV,QAASF,EACT,OAAQC,CACV,EC1BA,OAAS,aAAAE,MAAiB,2BAG1B,OAAS,oBAAAC,MAAwB,8BAM1B,SAASC,EAA6CC,EAA2C,CACtG,OAAOC,EAAUD,EAAUE,GAAWJ,EAAiBI,EAAQC,CAAe,CAAC,CACjF,CCXA,OAAS,YAAAC,EAAU,oBAAAC,MAAwB,8BAOpC,SAASC,EAAwBC,EAA2C,CACjF,OACEC,EAASD,CAAO,EAAIE,EAAiBF,EAASG,CAAgB,EAAIA,CAEtE,CCXA,OAAS,oBAAAC,EAAkB,YAAAC,MAAgB,8BAOpC,SAASC,EAAsBC,EAAuC,CAC3E,OAAQC,EAASD,CAAM,EAAIE,EAAiBF,EAAQG,CAAe,EAAIA,CACzE,CJ4BO,SAASC,EAAcC,EAA6C,CACzE,IAAMC,EAAQC,EAAcF,CAAK,EAGjC,GAFAG,EAAcH,CAAK,EAEfI,EAAUJ,EAAO,YAAY,EAAG,CAClC,GAAI,CAACK,EAASL,EAAM,UAAU,EAC5B,MAAM,IAAI,MAAM,iCAAiC,KAAK,UAAUA,EAAM,UAAU,GAAG,EAErF,QAAWM,KAAa,OAAO,OAAON,EAAM,UAAU,EAChDI,EAAUE,EAAW,QAAQ,GAC/BC,EAAeD,EAAU,OAAQL,CAAK,EAI9C,CAqBO,SAASO,EAA6CR,EAAmC,CAC9F,IAAMC,EAAQC,EAAcF,CAAK,EAC3BS,EAAaT,EAAM,YAAc,CAAC,EAElCU,EAA2B,OAAO,YACtC,OAAO,QAAQD,CAAU,EACtB,IAAI,CAAC,CAACE,EAAcL,CAAS,IAC5B,OAAO,QAAQA,EAAU,QAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAACM,EAAUC,CAAK,KAC1DC,EAAcD,EAAOZ,CAAK,EACnB,CACL,GAAGU,MAAiBC,IACpBG,EAAaC,EAAiBH,EAAO,CAAE,UAAWF,EAAc,KAAMC,CAAS,CAAC,EAAGX,CAAK,CAC1F,EACD,CACH,EACC,KAAK,CACV,EAEMgB,EAAgBC,EAAalB,CAAK,EAExC,OAAOgB,EACL,CACE,GAAGC,EACH,OAAQ,CAAE,GAAGA,EAAc,OAAQ,GAAGP,CAAyB,EAC/D,QAASM,EAAiBC,EAAc,QAASE,EAAenB,EAAM,OAAO,CAAC,EAC9E,OAAQoB,EAAcpB,EAAM,MAAM,EAClC,QAASqB,EAAerB,EAAM,SAAWsB,EAAgB,OAAO,EAChE,eAAgBC,EAAIvB,EAAO,gBAAgB,EAC3C,QAASA,EAAM,OACjB,EACAsB,CACF,CACF,CAEO,SAASE,EAAyBxB,EAAkD,CACzF,OAAAD,EAAcC,CAAK,EACZQ,EAAaR,CAAK,CAC3B","names":["extendedScope","get","resolveTable","validateTable","mergeIfUndefined","validateTables","resolveStore","hasOwnKey","validateStore","isObject","CODEGEN_DEFAULTS","DEPLOY_DEFAULTS","CONFIG_DEFAULTS","mapObject","mergeIfUndefined","resolveSystems","systems","mapObject","system","SYSTEM_DEFAULTS","isObject","mergeIfUndefined","resolveCodegen","codegen","isObject","mergeIfUndefined","CODEGEN_DEFAULTS","mergeIfUndefined","isObject","resolveDeploy","deploy","isObject","mergeIfUndefined","DEPLOY_DEFAULTS","validateWorld","world","scope","extendedScope","validateStore","hasOwnKey","isObject","namespace","validateTables","resolveWorld","namespaces","resolvedNamespacedTables","namespaceKey","tableKey","table","validateTable","resolveTable","mergeIfUndefined","resolvedStore","resolveStore","resolveCodegen","resolveDeploy","resolveSystems","CONFIG_DEFAULTS","get","defineWorld"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/world",
-  "version": "2.0.0-main-07e12ea2",
+  "version": "2.0.0-main-20ffc95f",
   "description": "World framework",
   "repository": {
     "type": "git",
@@ -39,10 +39,10 @@
     "arktype": "1.0.29-alpha",
     "viem": "2.7.12",
     "zod": "^3.21.4",
-    "@latticexyz/common": "2.0.0-main-07e12ea2",
-    "@latticexyz/schema-type": "2.0.0-main-07e12ea2",
-    "@latticexyz/config": "2.0.0-main-07e12ea2",
-    "@latticexyz/store": "2.0.0-main-07e12ea2"
+    "@latticexyz/common": "2.0.0-main-20ffc95f",
+    "@latticexyz/config": "2.0.0-main-20ffc95f",
+    "@latticexyz/schema-type": "2.0.0-main-20ffc95f",
+    "@latticexyz/store": "2.0.0-main-20ffc95f"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.1",
@@ -57,8 +57,8 @@
     "tsup": "^6.7.0",
     "tsx": "^3.12.6",
     "vitest": "0.34.6",
-    "@latticexyz/abi-ts": "2.0.0-main-07e12ea2",
-    "@latticexyz/gas-report": "2.0.0-main-07e12ea2"
+    "@latticexyz/abi-ts": "2.0.0-main-20ffc95f",
+    "@latticexyz/gas-report": "2.0.0-main-20ffc95f"
   },
   "scripts": {
     "build": "pnpm run build:mud && pnpm run build:abi && pnpm run build:abi-ts && pnpm run build:js",

package/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);
   });
 });

package/ts/config/v2/compat.ts

@@ -26,17 +26,18 @@ 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"]>;
-      worldContractName: world["deployment"]["customWorldContract"];
-      postDeployScript: world["deployment"]["postDeployScript"];
-      deploysDirectory: world["deployment"]["deploysDirectory"];
-      worldsFile: world["deployment"]["worldsFile"];
+      worldContractName: world["deploy"]["customWorldContract"];
+      postDeployScript: world["deploy"]["postDeployScript"];
+      deploysDirectory: world["deploy"]["deploysDirectory"];
+      worldsFile: world["deploy"]["worldsFile"];
       worldInterfaceName: world["codegen"]["worldInterfaceName"];
       worldgenDirectory: world["codegen"]["worldgenDirectory"];
       worldImportPath: world["codegen"]["worldImportPath"];
+      v2: world;
     }
   : never;
 
@@ -45,14 +46,14 @@ export function worldToV1<world>(world: conform<world, World>): worldToV1<world>
     systems: systemsToV1(world.systems),
     excludeSystems: world.excludeSystems,
     modules: modulesToV1(world.modules),
-    worldContractName: world.deployment.customWorldContract,
-    postDeployScript: world.deployment.postDeployScript,
-    deploysDirectory: world.deployment.deploysDirectory,
-    worldsFile: world.deployment.worldsFile,
+    worldContractName: world.deploy.customWorldContract,
+    postDeployScript: world.deploy.postDeployScript,
+    deploysDirectory: world.deploy.deploysDirectory,
+    worldsFile: world.deploy.worldsFile,
     worldInterfaceName: world.codegen.worldInterfaceName,
     worldgenDirectory: world.codegen.worldgenDirectory,
     worldImportPath: world.codegen.worldImportPath,
   };
 
-  return { ...storeToV1(world as Store), ...v1WorldConfig } as worldToV1<world>;
+  return { ...storeToV1(world as Store), ...v1WorldConfig, v2: world } as worldToV1<world>;
 }

package/ts/config/v2/defaults.ts

@@ -10,7 +10,7 @@ export const CODEGEN_DEFAULTS = {
   worldImportPath: "@latticexyz/world/src/",
 } as const;
 
-export const DEPLOYMENT_DEFAULTS = {
+export const DEPLOY_DEFAULTS = {
   customWorldContract: undefined,
   postDeployScript: "PostDeploy",
   deploysDirectory: "./deploys",
@@ -23,5 +23,5 @@ export const CONFIG_DEFAULTS = {
   excludeSystems: [] as string[],
   modules: [],
   codegen: CODEGEN_DEFAULTS,
-  deployment: DEPLOYMENT_DEFAULTS,
+  deploy: DEPLOY_DEFAULTS,
 } as const;

package/ts/config/v2/deploy.ts

@@ -0,0 +1,10 @@
+import { mergeIfUndefined, isObject } from "@latticexyz/store/config/v2";
+import { DEPLOY_DEFAULTS } from "./defaults";
+
+export type resolveDeploy<deploy> = deploy extends {}
+  ? mergeIfUndefined<deploy, typeof DEPLOY_DEFAULTS>
+  : typeof DEPLOY_DEFAULTS;
+
+export function resolveDeploy<deploy>(deploy: deploy): resolveDeploy<deploy> {
+  return (isObject(deploy) ? mergeIfUndefined(deploy, DEPLOY_DEFAULTS) : DEPLOY_DEFAULTS) as resolveDeploy<deploy>;
+}

package/ts/config/v2/input.ts

@@ -21,7 +21,7 @@ export type SystemInput = {
 
 export type SystemsInput = { [key: string]: SystemInput };
 
-export type DeploymentInput = {
+export type DeployInput = {
   /**
    * Script to execute after the deployment is complete (Default "PostDeploy").
    * Script must be placed in the forge scripts directory (see foundry.toml) and have a ".s.sol" extension.
@@ -57,8 +57,8 @@ export type WorldInput = evaluate<
     excludeSystems?: string[];
     /** Modules to in the World */
     modules?: Module[];
-    /** Deployment config */
-    deployment?: DeploymentInput;
+    /** Deploy config */
+    deploy?: DeployInput;
     /** Codegen config */
     codegen?: CodegenInput;
   }

package/ts/config/v2/output.ts

@@ -29,7 +29,7 @@ export type System = {
 
 export type Systems = { readonly [key: string]: System };
 
-export type Deployment = {
+export type Deploy = {
   /** The name of a custom World contract to deploy. If no name is provided, a default MUD World is deployed */
   readonly customWorldContract: string | undefined;
   /**
@@ -58,8 +58,8 @@ export type World = Store & {
   readonly excludeSystems: readonly string[];
   /** Modules to in the World */
   readonly modules: readonly Module[];
-  /** Deployment config */
-  readonly deployment: Deployment;
+  /** Deploy config */
+  readonly deploy: Deploy;
   /** Codegen config */
   readonly codegen: Codegen;
 };

package/ts/config/v2/world.test.ts

@@ -2,8 +2,12 @@ import { describe, it } from "vitest";
 import { defineWorld } from "./world";
 import { attest } from "@arktype/attest";
 import { resourceToHex } from "@latticexyz/common";
-import { TABLE_CODEGEN_DEFAULTS, CODEGEN_DEFAULTS as STORE_CODEGEN_DEFAULTS } from "@latticexyz/store/config/v2";
-import { CODEGEN_DEFAULTS as WORLD_CODEGEN_DEFAULTS, DEPLOYMENT_DEFAULTS, CONFIG_DEFAULTS } from "./defaults";
+import {
+  TABLE_CODEGEN_DEFAULTS,
+  CODEGEN_DEFAULTS as STORE_CODEGEN_DEFAULTS,
+  TABLE_DEPLOY_DEFAULTS,
+} from "@latticexyz/store/config/v2";
+import { CODEGEN_DEFAULTS as WORLD_CODEGEN_DEFAULTS, DEPLOY_DEFAULTS, CONFIG_DEFAULTS } from "./defaults";
 import { World } from "./output";
 const CODEGEN_DEFAULTS = { ...STORE_CODEGEN_DEFAULTS, ...WORLD_CODEGEN_DEFAULTS };
 
@@ -51,6 +55,7 @@ describe("defineWorld", () => {
           namespace: "ExampleNamespace",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {},
@@ -111,6 +116,7 @@ describe("defineWorld", () => {
           namespace: "ExampleNamespace",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {
@@ -212,6 +218,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {},
@@ -260,6 +267,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {
@@ -307,12 +315,13 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {},
         enums: {},
         namespace: "",
-        deployment: DEPLOYMENT_DEFAULTS,
+        deploy: DEPLOY_DEFAULTS,
       } as const;
 
       attest<typeof expected>(config).equals(expected);
@@ -356,6 +365,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
           Second: {
             tableId: resourceToHex({ type: "table", namespace: "", name: "Second" }),
@@ -378,6 +388,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {},
@@ -431,6 +442,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
           Second: {
             tableId: resourceToHex({ type: "table", namespace: "", name: "Second" }),
@@ -453,6 +465,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {
@@ -562,6 +575,7 @@ describe("defineWorld", () => {
             namespace: "",
             codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
             type: "table",
+            deploy: TABLE_DEPLOY_DEFAULTS,
           },
         },
         userTypes: {

package/ts/config/v2/world.ts

@@ -19,7 +19,7 @@ import { Tables } from "@latticexyz/store";
 import { resolveSystems } from "./systems";
 import { resolveNamespacedTables, validateNamespaces } from "./namespaces";
 import { resolveCodegen } from "./codegen";
-import { resolveDeployment } from "./deployment";
+import { resolveDeploy } from "./deploy";
 
 export type validateWorld<world> = {
   readonly [key in keyof world]: key extends "tables"
@@ -58,8 +58,8 @@ export type resolveWorld<world> = evaluate<
         {
           [key in keyof world]: key extends "systems"
             ? resolveSystems<world[key] & SystemsInput>
-            : key extends "deployment"
-              ? resolveDeployment<world[key]>
+            : key extends "deploy"
+              ? resolveDeploy<world[key]>
               : key extends "codegen"
                 ? resolveCodegen<world[key]>
                 : world[key];
@@ -77,7 +77,7 @@ export function resolveWorld<const world extends WorldInput>(world: world): reso
   const resolvedNamespacedTables = Object.fromEntries(
     Object.entries(namespaces)
       .map(([namespaceKey, namespace]) =>
-        Object.entries(namespace.tables).map(([tableKey, table]) => {
+        Object.entries(namespace.tables ?? {}).map(([tableKey, table]) => {
           validateTable(table, scope);
           return [
             `${namespaceKey}__${tableKey}`,
@@ -95,7 +95,7 @@ export function resolveWorld<const world extends WorldInput>(world: world): reso
       ...resolvedStore,
       tables: { ...resolvedStore.tables, ...resolvedNamespacedTables },
       codegen: mergeIfUndefined(resolvedStore.codegen, resolveCodegen(world.codegen)),
-      deployment: resolveDeployment(world.deployment),
+      deploy: resolveDeploy(world.deploy),
       systems: resolveSystems(world.systems ?? CONFIG_DEFAULTS.systems),
       excludeSystems: get(world, "excludeSystems"),
       modules: world.modules,

package/ts/config/v2/worldWithShorthands.test.ts

@@ -2,7 +2,11 @@ import { describe, it } from "vitest";
 import { defineWorldWithShorthands } from "./worldWithShorthands";
 import { attest } from "@arktype/attest";
 import { resourceToHex } from "@latticexyz/common";
-import { TABLE_CODEGEN_DEFAULTS, CODEGEN_DEFAULTS as STORE_CODEGEN_DEFAULTS } from "@latticexyz/store/config/v2";
+import {
+  TABLE_CODEGEN_DEFAULTS,
+  CODEGEN_DEFAULTS as STORE_CODEGEN_DEFAULTS,
+  TABLE_DEPLOY_DEFAULTS,
+} from "@latticexyz/store/config/v2";
 import { CODEGEN_DEFAULTS as WORLD_CODEGEN_DEFAULTS, CONFIG_DEFAULTS } from "./defaults";
 const CODEGEN_DEFAULTS = { ...STORE_CODEGEN_DEFAULTS, ...WORLD_CODEGEN_DEFAULTS };
 
@@ -46,6 +50,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "ExampleNamespace",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {
@@ -108,6 +113,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "ExampleNamespace",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {
@@ -147,6 +153,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {},
@@ -184,6 +191,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: false as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: { CustomType: { type: "address", filePath: "path/to/file" as string } },
@@ -223,6 +231,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {},
@@ -262,6 +271,7 @@ describe("defineWorldWithShorthands", () => {
           namespace: "",
           codegen: { ...TABLE_CODEGEN_DEFAULTS, dataStruct: true as boolean },
           type: "table",
+          deploy: TABLE_DEPLOY_DEFAULTS,
         },
       },
       userTypes: {},

package/ts/config/v2/deployment.ts

@@ -1,12 +0,0 @@
-import { mergeIfUndefined, isObject } from "@latticexyz/store/config/v2";
-import { DEPLOYMENT_DEFAULTS } from "./defaults";
-
-export type resolveDeployment<deployment> = deployment extends {}
-  ? mergeIfUndefined<deployment, typeof DEPLOYMENT_DEFAULTS>
-  : typeof DEPLOYMENT_DEFAULTS;
-
-export function resolveDeployment<deployment>(deployment: deployment): resolveDeployment<deployment> {
-  return (
-    isObject(deployment) ? mergeIfUndefined(deployment, DEPLOYMENT_DEFAULTS) : DEPLOYMENT_DEFAULTS
-  ) as resolveDeployment<deployment>;
-}