Autoload from src/handlers

.cursor/worktrees.json

@@ -1,5 +1,6 @@
 {
   "setup-worktree": [
+    "cd codegenerator/cli/npm/envio && pnpm install && pnpm rescript",
     "cd scenarios/test_codegen && pnpm install",
     "pnpm codegen",
     "pnpm rescript",

.github/workflows/build_and_test.yml

@@ -125,7 +125,7 @@ jobs:
         if: steps.changes.outputs.testChanges == 'true'
         uses: actions/setup-node@v4
         with:
-          node-version: 18.15.0
+          node-version: 22.10.0
 
       - name: test_codegen build
         if: steps.changes.outputs.testChanges == 'true'

.github/workflows/release.yml

@@ -222,7 +222,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v4
         with:
-          node-version: "18.16.0"
+          node-version: 22.10.0
           registry-url: "https://registry.npmjs.org"
 
       - name: Publish to NPM
@@ -277,7 +277,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22.10.0
           registry-url: "https://registry.npmjs.org"
           cache: "pnpm"
           cache-dependency-path: codegenerator/cli/npm/envio/pnpm-lock.yaml

.github/workflows/templates_integration_test.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: 22.10.0
       - name: Pre-pull docker-compose images
         run: |
           cd ../cli/templates/static/codegen # we use the docker-compose.yml in the static folder

codegenerator/cli/npm/envio/evm.schema.json

@@ -124,6 +124,13 @@
           "type": "null"
         }
       ]
+    },
+    "handlers": {
+      "description": "Optional relative path to handlers directory for auto-loading. Defaults to 'src/handlers' if not specified.",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "additionalProperties": false,
@@ -153,8 +160,11 @@
           ]
         },
         "handler": {
-          "description": "The relative path to a file where handlers are registered for the given contract",
-          "type": "string"
+          "description": "Optional relative path to a file where handlers are registered for the given contract. If not provided, handlers can be auto-loaded from src directory.",
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "events": {
           "description": "A list of events that should be indexed on this contract",
@@ -167,7 +177,6 @@
       "additionalProperties": false,
       "required": [
         "name",
-        "handler",
         "events"
       ]
     },
@@ -611,8 +620,11 @@
           ]
         },
         "handler": {
-          "description": "The relative path to a file where handlers are registered for the given contract",
-          "type": "string"
+          "description": "Optional relative path to a file where handlers are registered for the given contract. If not provided, handlers can be auto-loaded from src directory.",
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "events": {
           "description": "A list of events that should be indexed on this contract",

codegenerator/cli/npm/envio/fuel.schema.json

@@ -63,6 +63,13 @@
         "boolean",
         "null"
       ]
+    },
+    "handlers": {
+      "description": "Optional relative path to handlers directory for auto-loading. Defaults to 'src/handlers' if not specified.",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "additionalProperties": false,
@@ -90,8 +97,11 @@
           "type": "string"
         },
         "handler": {
-          "description": "The relative path to a file where handlers are registered for the given contract",
-          "type": "string"
+          "description": "Optional relative path to a file where handlers are registered for the given contract. If not provided, handlers can be auto-loaded from src directory.",
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "events": {
           "description": "A list of events that should be indexed on this contract",
@@ -105,7 +115,6 @@
       "required": [
         "name",
         "abi_file_path",
-        "handler",
         "events"
       ]
     },
@@ -238,8 +247,11 @@
           "type": "string"
         },
         "handler": {
-          "description": "The relative path to a file where handlers are registered for the given contract",
-          "type": "string"
+          "description": "Optional relative path to a file where handlers are registered for the given contract. If not provided, handlers can be auto-loaded from src directory.",
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "events": {
           "description": "A list of events that should be indexed on this contract",

codegenerator/cli/npm/envio/package.json

@@ -19,6 +19,9 @@
     "url": "https://github.com/enviodev/hyperindex/issues"
   },
   "homepage": "https://envio.dev",
+  "engines": {
+    "node": ">=22.0.0 <=22.10.0"
+  },
   "dependencies": {
     "@clickhouse/client": "1.12.1",
     "@envio-dev/hypersync-client": "0.6.6",

codegenerator/cli/npm/envio/package.json.tmpl

@@ -24,6 +24,9 @@
     "url": "https://github.com/enviodev/hyperindex/issues"
   },
   "homepage": "https://envio.dev",
+  "engines": {
+    "node": ">=22.0.0 <=22.10.0"
+  },
   "optionalDependencies": {
     "envio-linux-x64": "${version}",
     "envio-linux-arm64": "${version}",

codegenerator/cli/npm/envio/src/Utils.res

@@ -198,6 +198,8 @@ module UnsafeIntOperators = {
   external \"-": (int, int) => int = "%subfloat"
 }
 
+type asyncIterator<'a>
+
 module Array = {
   let immutableEmpty: array<unknown> = []
 
@@ -360,6 +362,19 @@ Helper to check if a value exists in an array
   external copy: array<'a> => array<'a> = "slice"
 
   @send external at: (array<'a>, int) => option<'a> = "at"
+
+  /**
+  Converts an async iterator to an array by iterating through all values
+  */
+  let fromAsyncIterator: asyncIterator<string> => promise<
+    array<string>,
+  > = %raw(`async (iterator) => {
+    const result = [];
+    for await (const item of iterator) {
+      result.push(item);
+    }
+    return result;
+  }`)
 }
 
 module String = {

codegenerator/cli/npm/envio/src/db/InternalTable.res

@@ -357,7 +357,6 @@ module PersistedState = {
     envio_version: string,
     config_hash: string,
     schema_hash: string,
-    handler_files_hash: string,
     abi_files_hash: string,
   }
 
@@ -368,7 +367,6 @@ module PersistedState = {
       mkField("envio_version", String, ~fieldSchema=S.string),
       mkField("config_hash", String, ~fieldSchema=S.string),
       mkField("schema_hash", String, ~fieldSchema=S.string),
-      mkField("handler_files_hash", String, ~fieldSchema=S.string),
       mkField("abi_files_hash", String, ~fieldSchema=S.string),
     ],
   )

codegenerator/cli/src/cli_args/init_config.rs

@@ -61,40 +61,38 @@ pub mod evm {
                     })
                     .collect();
 
-                let handler = init_config.language.get_event_handler_directory();
-
-                let config = if is_multi_chain_contract {
-                    //Add the contract to global contract config and return none for local contract
-                    //config
-                    let global_contract = GlobalContract {
-                        name: selected_contract.name.clone(),
-                        config: ContractConfig {
-                            abi_file_path: None,
-                            handler,
-                            events,
-                        },
-                    };
-
-                    unique_hashmap::try_insert(
-                        &mut global_contracts,
-                        selected_contract.name.clone(),
-                        global_contract,
-                    )
-                    .context(format!(
-                        "Unexpected, failed to add global contract {}. Contract should have \
-                         unique names",
-                        selected_contract.name
-                    ))?;
-                    None
-                } else {
-                    //Return some for local contract config
-                    Some(ContractConfig {
+            let config = if is_multi_chain_contract {
+                //Add the contract to global contract config and return none for local contract
+                //config
+                let global_contract = GlobalContract {
+                    name: selected_contract.name.clone(),
+                    config: ContractConfig {
                         abi_file_path: None,
-                        handler,
-                        events,
-                    })
+                        handler: None,
+                        events: events.clone(),
+                    },
                 };
 
+                unique_hashmap::try_insert(
+                    &mut global_contracts,
+                    selected_contract.name.clone(),
+                    global_contract,
+                )
+                .context(format!(
+                    "Unexpected, failed to add global contract {}. Contract should have \
+                     unique names",
+                    selected_contract.name
+                ))?;
+                None
+            } else {
+                //Return some for local contract config
+                Some(ContractConfig {
+                    abi_file_path: None,
+                    handler: None,
+                    events,
+                })
+            };
+
                 for selected_network in &selected_contract.networks {
                     let address = selected_network
                         .addresses
@@ -172,6 +170,7 @@ pub mod evm {
                 raw_events: None,
                 preload_handlers: Some(true),
                 address_format: None,
+                handlers: None,
             })
         }
 
@@ -282,11 +281,11 @@ pub mod fuel {
                                     .map(|a| a.to_string())
                                     .collect::<Vec<String>>()
                                     .into(),
-                                config: Some(ContractConfig {
-                                    abi_file_path: selected_contract.get_vendored_abi_file_path(),
-                                    handler: init_config.language.get_event_handler_directory(),
-                                    events: selected_contract.selected_events.clone(),
-                                }),
+                            config: Some(ContractConfig {
+                                abi_file_path: selected_contract.get_vendored_abi_file_path(),
+                                handler: None,
+                                events: selected_contract.selected_events.clone(),
+                            }),
                                 start_block: None,
                             })
                             .collect(),
@@ -304,6 +303,7 @@ pub mod fuel {
                 raw_events: None,
                 preload_handlers: Some(true),
                 networks: network_configs,
+                handlers: None,
             }
         }
     }