envio 3.0.0-alpha.21 → 3.0.0-alpha.22

package/src/LogSelection.res.mjs

@@ -1,68 +1,67 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Utils from "./Utils.res.mjs";
-import * as Js_exn from "rescript/lib/es6/js_exn.js";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
+import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
+import * as Belt_Option from "@rescript/runtime/lib/es6/Belt_Option.js";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
-var MissingRequiredTopic0 = /* @__PURE__ */Caml_exceptions.create("LogSelection.MissingRequiredTopic0");
+let MissingRequiredTopic0 = /* @__PURE__ */Primitive_exceptions.create("LogSelection.MissingRequiredTopic0");
 
 function makeTopicSelection(topic0, topic1Opt, topic2Opt, topic3Opt) {
-  var topic1 = topic1Opt !== undefined ? topic1Opt : [];
-  var topic2 = topic2Opt !== undefined ? topic2Opt : [];
-  var topic3 = topic3Opt !== undefined ? topic3Opt : [];
+  let topic1 = topic1Opt !== undefined ? topic1Opt : [];
+  let topic2 = topic2Opt !== undefined ? topic2Opt : [];
+  let topic3 = topic3Opt !== undefined ? topic3Opt : [];
   if (Utils.$$Array.isEmpty(topic0)) {
     return {
-            TAG: "Error",
-            _0: {
-              RE_EXN_ID: MissingRequiredTopic0
-            }
-          };
+      TAG: "Error",
+      _0: {
+        RE_EXN_ID: MissingRequiredTopic0
+      }
+    };
   } else {
     return {
-            TAG: "Ok",
-            _0: {
-              topic0: topic0,
-              topic1: topic1,
-              topic2: topic2,
-              topic3: topic3
-            }
-          };
+      TAG: "Ok",
+      _0: {
+        topic0: topic0,
+        topic1: topic1,
+        topic2: topic2,
+        topic3: topic3
+      }
+    };
   }
 }
 
 function hasFilters(param) {
-  return Belt_Option.isSome(Caml_option.undefined_to_opt([
-                    param.topic1,
-                    param.topic2,
-                    param.topic3
-                  ].find(function (topic) {
-                      return !Utils.$$Array.isEmpty(topic);
-                    })));
+  return Belt_Option.isSome([
+    param.topic1,
+    param.topic2,
+    param.topic3
+  ].find(topic => !Utils.$$Array.isEmpty(topic)));
 }
 
 function compressTopicSelections(topicSelections) {
-  var topic0sOfSelectionsWithoutFilters = [];
-  var selectionsWithFilters = [];
-  Belt_Array.forEach(topicSelections, (function (selection) {
-          if (hasFilters(selection)) {
-            selectionsWithFilters.push(selection);
-            return ;
-          } else {
-            return Belt_Array.forEach(selection.topic0, (function (topic0) {
-                          topic0sOfSelectionsWithoutFilters.push(topic0);
-                        }));
-          }
-        }));
+  let topic0sOfSelectionsWithoutFilters = [];
+  let selectionsWithFilters = [];
+  Belt_Array.forEach(topicSelections, selection => {
+    if (hasFilters(selection)) {
+      selectionsWithFilters.push(selection);
+      return;
+    } else {
+      return Belt_Array.forEach(selection.topic0, topic0 => {
+        topic0sOfSelectionsWithoutFilters.push(topic0);
+      });
+    }
+  });
   if (topic0sOfSelectionsWithoutFilters.length === 0) {
     return selectionsWithFilters;
   }
-  var selectionWithoutFilters_topic1 = [];
-  var selectionWithoutFilters_topic2 = [];
-  var selectionWithoutFilters_topic3 = [];
-  var selectionWithoutFilters = {
+  let selectionWithoutFilters_topic1 = [];
+  let selectionWithoutFilters_topic2 = [];
+  let selectionWithoutFilters_topic3 = [];
+  let selectionWithoutFilters = {
     topic0: topic0sOfSelectionsWithoutFilters,
     topic1: selectionWithoutFilters_topic1,
     topic2: selectionWithoutFilters_topic2,
@@ -72,139 +71,210 @@ function compressTopicSelections(topicSelections) {
 }
 
 function make(addresses, topicSelections) {
-  var topicSelections$1 = compressTopicSelections(topicSelections);
+  let topicSelections$1 = compressTopicSelections(topicSelections);
   return {
-          addresses: addresses,
-          topicSelections: topicSelections$1
-        };
+    addresses: addresses,
+    topicSelections: topicSelections$1
+  };
+}
+
+let eventBlockRangeSchema = S$RescriptSchema.strict(S$RescriptSchema.object(s => ({
+  _gte: s.f("_gte", S$RescriptSchema.option(S$RescriptSchema.int))
+})));
+
+function extractStartBlock(where, onEventBlockFilterSchema, contractName) {
+  if (typeof where === "boolean") {
+    return;
+  }
+  try {
+    let inner = S$RescriptSchema.parseOrThrow(where, onEventBlockFilterSchema);
+    if (inner !== undefined) {
+      return S$RescriptSchema.parseOrThrow(Primitive_option.valFromOption(inner), eventBlockRangeSchema)._gte;
+    } else {
+      return;
+    }
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    if (exn.RE_EXN_ID === S$RescriptSchema.Raised) {
+      return Stdlib_JsError.throwWithMessage(`Invalid where configuration for ` + contractName + `. \`block\` filter is invalid: ` + Utils.prettifyExn(exn._1) + `. Only \`_gte\` is supported on event filters — use \`indexer.onBlock\` for \`_lte\` or \`_every\`.`);
+    }
+    throw exn;
+  }
+}
+
+function makeChainArg(contractName, chainId, addresses) {
+  let chainObj = {};
+  chainObj["id"] = chainId;
+  chainObj[contractName] = {
+    addresses: addresses
+  };
+  return chainObj;
+}
+
+function makeDetectionChainArg(contractName, chainId, getAddresses) {
+  let contractObj = Object.create(null);
+  Object.defineProperty(contractObj, "addresses", {
+    enumerable: true,
+    get: getAddresses
+  });
+  let chainObj = {};
+  chainObj["id"] = chainId;
+  chainObj[contractName] = contractObj;
+  return chainObj;
 }
 
-var emptyTopics = [];
+let emptyTopics = [];
 
 function noopGetter(param) {
   return emptyTopics;
 }
 
-function parseEventFiltersOrThrow(eventFilters, sighash, params, topic1Opt, topic2Opt, topic3Opt) {
-  var topic1 = topic1Opt !== undefined ? topic1Opt : noopGetter;
-  var topic2 = topic2Opt !== undefined ? topic2Opt : noopGetter;
-  var topic3 = topic3Opt !== undefined ? topic3Opt : noopGetter;
-  var filterByAddresses = {
+function parseEventFiltersOrThrow(eventFilters, sighash, params, contractName, probeChainId, onEventBlockFilterSchema, topic1Opt, topic2Opt, topic3Opt) {
+  let topic1 = topic1Opt !== undefined ? topic1Opt : noopGetter;
+  let topic2 = topic2Opt !== undefined ? topic2Opt : noopGetter;
+  let topic3 = topic3Opt !== undefined ? topic3Opt : noopGetter;
+  let filterByAddresses = {
     contents: false
   };
-  var topic0 = [sighash];
-  var $$default = {
+  let startBlock;
+  let topic0 = [sighash];
+  let $$default = {
     topic0: topic0,
     topic1: emptyTopics,
     topic2: emptyTopics,
     topic3: emptyTopics
   };
-  var parse = function (eventFilters) {
-    if (eventFilters === true) {
+  let paramsRecordToTopicSelection = paramsFilter => {
+    let filterKeys = Object.keys(paramsFilter);
+    if (filterKeys.length !== 0) {
+      filterKeys.forEach(key => {
+        if (!params.includes(key)) {
+          return Stdlib_JsError.throwWithMessage(`Invalid where configuration. The event doesn't have an indexed parameter "` + key + `" and can't use it for filtering`);
+        }
+      });
+      return {
+        topic0: topic0,
+        topic1: topic1(paramsFilter),
+        topic2: topic2(paramsFilter),
+        topic3: topic3(paramsFilter)
+      };
+    } else {
+      return $$default;
+    }
+  };
+  let acceptedWhereKeys = [
+    "params",
+    "block"
+  ];
+  let parse = where => {
+    if (where === true) {
       return [$$default];
     }
-    if (eventFilters === false) {
+    if (where === false) {
       return [];
     }
-    var tmp;
-    tmp = !Array.isArray(eventFilters) && (eventFilters === null || typeof eventFilters !== "object") && typeof eventFilters !== "number" && typeof eventFilters !== "string" && typeof eventFilters !== "boolean" ? [eventFilters] : (
-        Array.isArray(eventFilters) ? (
-            eventFilters.length !== 0 ? eventFilters : [{}]
-          ) : [eventFilters]
-      );
-    return tmp.map(function (eventFilter) {
-                if (!Array.isArray(eventFilter) && (eventFilter === null || typeof eventFilter !== "object") && typeof eventFilter !== "number" && typeof eventFilter !== "string" && typeof eventFilter !== "boolean") {
-                  return Js_exn.raiseError("Invalid event filters configuration. Expected an object");
-                }
-                if (!(typeof eventFilter === "object" && !Array.isArray(eventFilter))) {
-                  return Js_exn.raiseError("Invalid event filters configuration. Expected an object");
-                }
-                var filterKeys = Object.keys(eventFilter);
-                if (filterKeys.length !== 0) {
-                  filterKeys.forEach(function (key) {
-                        if (!params.includes(key)) {
-                          return Js_exn.raiseError("Invalid event filters configuration. The event doesn't have an indexed parameter \"" + key + "\" and can't use it for filtering");
-                        }
-                        
-                      });
-                  return {
-                          topic0: topic0,
-                          topic1: topic1(eventFilter),
-                          topic2: topic2(eventFilter),
-                          topic3: topic3(eventFilter)
-                        };
-                } else {
-                  return $$default;
-                }
-              });
+    if (typeof where !== "object" || where === null || Array.isArray(where)) {
+      return Stdlib_JsError.throwWithMessage("Invalid where configuration. Expected an object");
+    }
+    Object.keys(where).forEach(key => {
+      if (!acceptedWhereKeys.includes(key)) {
+        return Stdlib_JsError.throwWithMessage(`Invalid where configuration. Unknown field "` + key + `". Indexed parameter filters must be nested under \`params\` and block-range filters under \`block\``);
+      }
+    });
+    let match = where["params"];
+    if (match === undefined) {
+      return [$$default];
+    }
+    if (Array.isArray(match)) {
+      if (match.length !== 0) {
+        return match.map(item => {
+          if (typeof item === "object" && item !== null && !Array.isArray(item)) {
+            return paramsRecordToTopicSelection(item);
+          } else {
+            return Stdlib_JsError.throwWithMessage("Invalid where configuration. Each entry in `params` must be an object");
+          }
+        });
+      } else {
+        return [$$default];
+      }
+    }
+    if (match === null) {
+      return Stdlib_JsError.throwWithMessage("Invalid where configuration. Expected `params` to be an object or an array of objects");
+    }
+    switch (typeof match) {
+      case "object" :
+        return [paramsRecordToTopicSelection(match)];
+      default:
+        return Stdlib_JsError.throwWithMessage("Invalid where configuration. Expected `params` to be an object or an array of objects");
+    }
   };
-  var getEventFiltersOrThrow;
+  let getEventFiltersOrThrow;
   if (eventFilters !== undefined) {
     if (typeof eventFilters === "function") {
+      let probedResult;
       try {
-        var args = Object.defineProperty({
-              chainId: 0,
-              addresses: []
-            }, "addresses", {
-              get: (function () {
-                  filterByAddresses.contents = true;
-                  return [];
-                })
-            });
-        eventFilters(args);
+        let chain = makeDetectionChainArg(contractName, probeChainId, () => {
+          filterByAddresses.contents = true;
+          return [];
+        });
+        probedResult = eventFilters({
+          chain: chain
+        });
+      } catch (exn) {
+        probedResult = undefined;
       }
-      catch (exn){
-        
+      if (probedResult !== undefined) {
+        startBlock = extractStartBlock(probedResult, onEventBlockFilterSchema, contractName);
       }
-      getEventFiltersOrThrow = filterByAddresses.contents ? (function (chain) {
-            return {
-                    TAG: "Dynamic",
-                    _0: (function (addresses) {
-                        return parse(eventFilters({
-                                        chainId: chain,
-                                        addresses: addresses
-                                      }));
-                      })
-                  };
-          }) : (function (chain) {
-            return {
-                    TAG: "Static",
-                    _0: parse(eventFilters({
-                              chainId: chain,
-                              addresses: []
-                            }))
-                  };
-          });
+      getEventFiltersOrThrow = filterByAddresses.contents ? chain => ({
+          TAG: "Dynamic",
+          _0: addresses => {
+            let chainArg = makeChainArg(contractName, chain, addresses);
+            return parse(eventFilters({
+              chain: chainArg
+            }));
+          }
+        }) : chain => {
+          let chainArg = makeDetectionChainArg(contractName, chain, () => Stdlib_JsError.throwWithMessage(`Invalid where configuration. Event callback for contract "` + contractName + `" read \`chain.` + contractName + `.addresses\` at runtime but the probe didn't detect the access on chainId ` + chain.toString() + `. Move the \`chain.` + contractName + `.addresses\` read above any \`chain.id\` branching so the probe picks up the dependency and switches to the dynamic fetch path.`));
+          return {
+            TAG: "Static",
+            _0: parse(eventFilters({
+              chain: chainArg
+            }))
+          };
+        };
     } else {
-      var $$static = {
+      startBlock = extractStartBlock(eventFilters, onEventBlockFilterSchema, contractName);
+      let $$static = {
         TAG: "Static",
         _0: parse(eventFilters)
       };
-      getEventFiltersOrThrow = (function (param) {
-          return $$static;
-        });
+      getEventFiltersOrThrow = param => $$static;
     }
   } else {
-    var $$static$1 = {
+    let $$static$1 = {
       TAG: "Static",
       _0: [$$default]
     };
-    getEventFiltersOrThrow = (function (param) {
-        return $$static$1;
-      });
+    getEventFiltersOrThrow = param => $$static$1;
   }
   return {
-          getEventFiltersOrThrow: getEventFiltersOrThrow,
-          filterByAddresses: filterByAddresses.contents
-        };
+    getEventFiltersOrThrow: getEventFiltersOrThrow,
+    filterByAddresses: filterByAddresses.contents,
+    startBlock: startBlock
+  };
 }
 
 export {
-  MissingRequiredTopic0 ,
-  makeTopicSelection ,
-  hasFilters ,
-  compressTopicSelections ,
-  make ,
-  parseEventFiltersOrThrow ,
+  MissingRequiredTopic0,
+  makeTopicSelection,
+  hasFilters,
+  compressTopicSelections,
+  make,
+  eventBlockRangeSchema,
+  extractStartBlock,
+  makeChainArg,
+  makeDetectionChainArg,
+  parseEventFiltersOrThrow,
 }
-/* Utils Not a pure module */
+/* eventBlockRangeSchema Not a pure module */

package/src/Logging.res

@@ -22,7 +22,7 @@ let logLevels = [
   ("warn", 40),
   ("error", 50),
   ("fatal", 60),
-]->Js.Dict.fromArray
+]->Dict.fromArray
 
 %%private(let logger = ref(None))
 
@@ -39,11 +39,15 @@ let makeLogger = (~logStrategy, ~logFilePath, ~defaultFileLogLevel, ~userLogLeve
     level: defaultFileLogLevel,
   }
 
-  let makeMultiStreamLogger =
-    MultiStreamLogger.make(~userLogLevel, ~defaultFileLogLevel, ~customLevels=logLevels, ...)
+  let makeMultiStreamLogger = MultiStreamLogger.make(
+    ~userLogLevel,
+    ~defaultFileLogLevel,
+    ~customLevels=logLevels,
+    ...
+  )
 
   // Empty base disables pid and hostname in logs
-  let base: Js.Json.t = %raw("{}")
+  let base: JSON.t = %raw("{}")
 
   switch logStrategy {
   | EcsFile =>
@@ -86,7 +90,7 @@ let setLogger = l => {
 let getLogger = () => {
   switch logger.contents {
   | Some(logger) => logger
-  | None => Js.Exn.raiseError("Unreachable code. Logger not initialized")
+  | None => JsError.throwWithMessage("Unreachable code. Logger not initialized")
   }
 }
 
@@ -155,7 +159,7 @@ let getItemLogger = {
   let cacheKey = "_logger"
   (item: Internal.item) => {
     switch item
-    ->(Utils.magic: Internal.item => Js.Dict.t<Pino.t>)
+    ->(Utils.magic: Internal.item => dict<Pino.t>)
     ->Utils.Dict.dangerouslyGetNonOption(cacheKey) {
     | Some(l) => l
     | None => {
@@ -178,7 +182,7 @@ let getItemLogger = {
             }->createChildParams
           },
         )
-        item->(Utils.magic: Internal.item => Js.Dict.t<Pino.t>)->Js.Dict.set(cacheKey, l)
+        item->(Utils.magic: Internal.item => dict<Pino.t>)->Dict.set(cacheKey, l)
         l
       }
     }
@@ -190,8 +194,8 @@ let logForItem = (item, level: Pino.logLevel, message: string, ~params=?) => {
   (
     item
     ->getItemLogger
-    ->(Utils.magic: Pino.t => Js.Dict.t<(option<'a>, string) => unit>)
-    ->Js.Dict.unsafeGet((level :> string))
+    ->(Utils.magic: Pino.t => dict<(option<'a>, string) => unit>)
+    ->Dict.getUnsafe((level :> string))
   )(params, message)
 }