rename directory, indexFile

latticexyz · Mar 20, 2024 · b7c8759 · b7c8759
1 parent 48b1f4c
commit b7c8759
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/packages/store/ts/config/v2/compat.ts b/packages/store/ts/config/v2/compat.ts
@@ -15,8 +15,8 @@ export type storeToV1<store> = store extends Store
       };
       storeImportPath: store["codegen"]["storeImportPath"];
       userTypesFilename: store["codegen"]["userTypesFilename"];
-      codegenDirectory: store["codegen"]["codegenDirectory"];
-      codegenIndexFilename: store["codegen"]["codegenIndexFilename"];
+      codegenDirectory: store["codegen"]["outputDirectory"];
+      codegenIndexFilename: store["codegen"]["indexFilename"];
       tables: {
         [key in keyof store["tables"] as store["tables"][key]["name"]]: tableToV1<store["tables"][key]>;
       };
@@ -27,7 +27,7 @@ export type storeToV1<store> = store extends Store
 type schemaToV1<schema extends Schema> = { [key in keyof schema]: schema[key]["internalType"] };
 
 export type tableToV1<table extends Table> = {
-  directory: table["codegen"]["directory"];
+  directory: table["codegen"]["outputDirectory"];
   dataStruct: table["codegen"]["dataStruct"];
   tableIdArgument: table["codegen"]["tableIdArgument"];
   storeArgument: table["codegen"]["storeArgument"];
@@ -48,7 +48,7 @@ export function storeToV1<store>(store: conform<store, Store>): storeToV1<store>
       return [
         table.name,
         {
-          directory: table.codegen.directory,
+          directory: table.codegen.outputDirectory,
           dataStruct: table.codegen.dataStruct,
           tableIdArgument: table.codegen.tableIdArgument,
           storeArgument: table.codegen.storeArgument,
@@ -67,8 +67,8 @@ export function storeToV1<store>(store: conform<store, Store>): storeToV1<store>
     userTypes: resolvedUserTypes,
     storeImportPath: store.codegen.storeImportPath,
     userTypesFilename: store.codegen.userTypesFilename,
-    codegenDirectory: store.codegen.codegenDirectory,
-    codegenIndexFilename: store.codegen.codegenIndexFilename,
+    codegenDirectory: store.codegen.outputDirectory,
+    codegenIndexFilename: store.codegen.indexFilename,
     tables: resolvedTables,
     v2: store,
   } as unknown as storeToV1<store>;

diff --git a/packages/store/ts/config/v2/defaults.ts b/packages/store/ts/config/v2/defaults.ts
@@ -1,12 +1,12 @@
 export const CODEGEN_DEFAULTS = {
   storeImportPath: "@latticexyz/store/src/",
   userTypesFilename: "common.sol",
-  codegenDirectory: "codegen",
-  codegenIndexFilename: "index.sol",
+  outputDirectory: "codegen",
+  indexFilename: "index.sol",
 } as const;
 
 export const TABLE_CODEGEN_DEFAULTS = {
-  directory: "tables",
+  outputDirectory: "tables",
   tableIdArgument: false,
   storeArgument: false,
 } as const;

diff --git a/packages/store/ts/config/v2/output.ts b/packages/store/ts/config/v2/output.ts
@@ -11,7 +11,7 @@ export type Enums = {
 };
 
 export type TableCodegen = {
-  readonly directory: string;
+  readonly outputDirectory: string;
   readonly tableIdArgument: boolean;
   readonly storeArgument: boolean;
   readonly dataStruct: boolean;
@@ -29,8 +29,8 @@ export type Table = BaseTable & {
 export type Codegen = {
   readonly storeImportPath: string;
   readonly userTypesFilename: string;
-  readonly codegenDirectory: string;
-  readonly codegenIndexFilename: string;
+  readonly outputDirectory: string;
+  readonly indexFilename: string;
 };
 
 export type Store = {

diff --git a/packages/store/ts/config/v2/table.ts b/packages/store/ts/config/v2/table.ts
@@ -121,7 +121,7 @@ export type resolveTableCodegen<input extends TableInput> = {
 export function resolveTableCodegen<input extends TableInput>(input: input): resolveTableCodegen<input> {
   const options = input.codegen;
   return {
-    directory: get(options, "directory") ?? TABLE_CODEGEN_DEFAULTS.directory,
+    outputDirectory: get(options, "outputDirectory") ?? TABLE_CODEGEN_DEFAULTS.outputDirectory,
     tableIdArgument: get(options, "tableIdArgument") ?? TABLE_CODEGEN_DEFAULTS.tableIdArgument,
     storeArgument: get(options, "storeArgument") ?? TABLE_CODEGEN_DEFAULTS.storeArgument,
     // dataStruct is true if there are at least 2 value fields