envio 3.6.1 → 3.7.0

package/src/LazyLoader.res.mjs

@@ -39,6 +39,17 @@ function timeoutAfter(timeoutMillis) {
   }));
 }
 
+function rememberLoaded(am, k) {
+  if (am.loadedKeys.push(k) <= am._cacheSize) {
+    return;
+  }
+  let old = am.loadedKeys.pop();
+  if (old !== undefined) {
+    am.externalPromises.delete(Primitive_option.valFromOption(old));
+    return;
+  }
+}
+
 async function loadNext(am, k) {
   am.inProgress.add(k);
   let awaitTaskPromiseAndLoadNextWithTimeout = async () => {
@@ -51,13 +62,7 @@ async function loadNext(am, k) {
       r(val);
     });
     am.inProgress.delete(k);
-    let loadedKeysNumber = am.loadedKeys.push(k);
-    if (loadedKeysNumber > am._cacheSize) {
-      let old = am.loadedKeys.pop();
-      if (old !== undefined) {
-        am.externalPromises.delete(Primitive_option.valFromOption(old));
-      }
-    }
+    rememberLoaded(am, k);
     let next = am.loaderQueue.pop();
     if (next !== undefined) {
       return await loadNext(am, Primitive_option.valFromOption(next));
@@ -106,6 +111,7 @@ export {
   make,
   deleteKey,
   timeoutAfter,
+  rememberLoaded,
   loadNext,
   get,
 }

package/src/Main.res

@@ -229,8 +229,8 @@ let buildChainsObject = (~config: Config.t) => {
 let getGlobalIndexer = (): 'indexer => {
   // Parse eventIdentity config to extract contractName, eventName, and options.
   // Supports two runtime formats:
-  // - From TypeScript: { contract: "X", event: "Y", wildcard?, where? }
-  // - From ReScript GADT: { event: { contract: "X", _0: "Y" }, wildcard?, where? }
+  // - From TypeScript: { contract: "X", event: "Y", wildcard?, where?, fields? }
+  // - From ReScript GADT: { event: { contract: "X", _0: "Y" }, wildcard?, where?, fields? }
   let parseIdentityConfig = (identityConfig: 'a) => {
     let raw =
       identityConfig->(
@@ -239,6 +239,7 @@ let getGlobalIndexer = (): 'indexer => {
           "event": unknown,
           "wildcard": option<bool>,
           "where": option<JSON.t>,
+          "fields": option<Internal.evmFieldsSelection>,
         }
       )
     // Detect format: if "contract" is a string, it's the TS format
@@ -255,12 +256,14 @@ let getGlobalIndexer = (): 'indexer => {
     }
     let wildcard = raw["wildcard"]
     let where = raw["where"]
-    let eventOptions: option<Internal.eventOptions<_>> = switch (wildcard, where) {
-    | (None, None) => None
-    | (wildcard, where) =>
+    let fields = raw["fields"]
+    let eventOptions: option<Internal.eventOptions<_>> = switch (wildcard, where, fields) {
+    | (None, None, None) => None
+    | (wildcard, where, fields) =>
       Some({
         ?wildcard,
         where: ?(where->(Utils.magic: option<JSON.t> => option<_>)),
+        ?fields,
       })
     }
     (contractName, eventName, eventOptions)
@@ -288,7 +291,12 @@ let getGlobalIndexer = (): 'indexer => {
   let parseSvmIdentityConfig = (identityConfig: 'a) => {
     let raw =
       identityConfig->(
-        Utils.magic: 'a => {"program": unknown, "instruction": unknown, "where": option<JSON.t>}
+        Utils.magic: 'a => {
+          "program": unknown,
+          "instruction": unknown,
+          "where": option<JSON.t>,
+          "fields": option<Internal.evmFieldsSelection>,
+        }
       )
     let (programName, instructionName) = if typeof(raw["program"]) === #string {
       (
@@ -300,11 +308,16 @@ let getGlobalIndexer = (): 'indexer => {
       (inst["contract"], inst["_0"])
     }
     let where = raw["where"]
-    let eventOptions: option<Internal.eventOptions<_>> = switch where {
-    | None => None
-    | Some(_) =>
+    // SVM takes its selection from the config, so `fields` is carried through
+    // only to be rejected by the registration — dropping it here would leave a
+    // plain-JS caller with a silently ignored option.
+    let fields = raw["fields"]
+    let eventOptions: option<Internal.eventOptions<_>> = switch (where, fields) {
+    | (None, None) => None
+    | (where, fields) =>
       Some({
         where: ?(where->(Utils.magic: option<JSON.t> => option<_>)),
+        ?fields,
       })
     }
     (programName, instructionName, eventOptions)

package/src/Main.res.mjs

@@ -232,10 +232,21 @@ function getGlobalIndexer() {
     }
     let wildcard = identityConfig.wildcard;
     let where = identityConfig.where;
-    let eventOptions = wildcard !== undefined || where !== undefined ? ({
+    let fields = identityConfig.fields;
+    let eventOptions;
+    let exit = 0;
+    if (wildcard !== undefined || where !== undefined || fields !== undefined) {
+      exit = 1;
+    } else {
+      eventOptions = undefined;
+    }
+    if (exit === 1) {
+      eventOptions = {
         wildcard: wildcard,
-        where: where
-      }) : undefined;
+        where: where,
+        fields: fields
+      };
+    }
     return [
       match[0],
       match[1],
@@ -262,8 +273,10 @@ function getGlobalIndexer() {
       ];
     }
     let where = identityConfig.where;
-    let eventOptions = where !== undefined ? ({
-        where: where
+    let fields = identityConfig.fields;
+    let eventOptions = where !== undefined || fields !== undefined ? ({
+        where: where,
+        fields: fields
       }) : undefined;
     return [
       match[0],