envio 3.1.2 → 3.2.0

package/src/db/EntityFilter.res.mjs

@@ -0,0 +1,424 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Table from "./Table.res.mjs";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
+
+function toString(tNonOptional) {
+  if (Array.isArray(tNonOptional)) {
+    return `[` + tNonOptional.map(toString).join(",") + `]`;
+  }
+  switch (typeof tNonOptional) {
+    case "string" :
+      return tNonOptional;
+    case "bigint" :
+    case "number" :
+      return tNonOptional.toString();
+    case "object" :
+      return tNonOptional.toString();
+    case "boolean" :
+      if (tNonOptional) {
+        return "true";
+      } else {
+        return "false";
+      }
+  }
+}
+
+function toString$1(value) {
+  if (value !== undefined) {
+    return toString(value);
+  } else {
+    return "undefined";
+  }
+}
+
+function eq(a, b) {
+  if (typeof a === "object" && !Array.isArray(a) && typeof b === "object" && !Array.isArray(b)) {
+    return a.isEqualTo(b);
+  } else {
+    return Primitive_object.equal(a, b);
+  }
+}
+
+function gt(a, b) {
+  if (typeof a === "object" && !Array.isArray(a) && typeof b === "object" && !Array.isArray(b)) {
+    return a.isGreaterThan(b);
+  } else {
+    return Primitive_object.greaterthan(a, b);
+  }
+}
+
+function lt(a, b) {
+  if (typeof a === "object" && !Array.isArray(a) && typeof b === "object" && !Array.isArray(b)) {
+    return a.isLessThan(b);
+  } else {
+    return Primitive_object.lessthan(a, b);
+  }
+}
+
+let FieldValue = {
+  toString: toString$1,
+  eq: eq,
+  gt: gt,
+  lt: lt
+};
+
+function toString$2(filter) {
+  switch (filter.operator) {
+    case "=" :
+      return filter.fieldName + `:Eq:` + toString$1(filter.fieldValue);
+    case ">" :
+      return filter.fieldName + `:Gt:` + toString$1(filter.fieldValue);
+    case "<" :
+      return filter.fieldName + `:Lt:` + toString$1(filter.fieldValue);
+    case "in" :
+      return filter.fieldName + `:In:[` + filter.fieldValue.map(toString$1).join(",") + `]`;
+    case "and" :
+      return `And(` + filter.filters.map(toString$2).join(",") + `)`;
+  }
+}
+
+function valuesCount(filter) {
+  switch (filter.operator) {
+    case "in" :
+      return filter.fieldValue.length;
+    case "and" :
+      return Stdlib_Array.reduce(filter.filters, 0, (acc, filter) => acc + valuesCount(filter) | 0);
+    default:
+      return 1;
+  }
+}
+
+let codegenHelpMessage = `Rerun 'pnpm dev' to update generated code after schema.graphql changes.`;
+
+function getUndefinedOrNullName(value) {
+  if (value === undefined) {
+    return "undefined";
+  } else if (value === null) {
+    return "null";
+  } else {
+    return;
+  }
+}
+
+function throwUnsupportedGetWhereValue(valueName, entityName, filterDisplay, hintOpt) {
+  let hint = hintOpt !== undefined ? hintOpt : "";
+  return Stdlib_JsError.throwWithMessage(`Invalid ` + valueName + ` value passed to context.` + entityName + `.getWhere(` + filterDisplay + `). Filtering by null or undefined values is not supported in getWhere.` + hint);
+}
+
+function parseGetWhereOrThrow(filter, entityName, table) {
+  let filterKeys = Object.keys(filter);
+  if (filterKeys.length === 0) {
+    Stdlib_JsError.throwWithMessage(`Empty filter passed to context.` + entityName + `.getWhere(). Please provide a filter like { fieldName: { _eq: value } }.`);
+  }
+  let filterGroups = filterKeys.flatMap(apiFieldName => {
+    let operatorObj = filter[apiFieldName];
+    let valueName = getUndefinedOrNullName(operatorObj);
+    if (valueName !== undefined) {
+      throwUnsupportedGetWhereValue(valueName, entityName, `{ ` + apiFieldName + `: ` + valueName + ` }`, ` Please provide an operator like { _eq: value }.`);
+    }
+    if (typeof operatorObj !== "object" || Array.isArray(operatorObj)) {
+      Stdlib_JsError.throwWithMessage(`Invalid value passed to context.` + entityName + `.getWhere({ ` + apiFieldName + `: ... }). Please provide an operator like { _eq: value }.`);
+    }
+    let operatorKeys = Object.keys(operatorObj);
+    if (operatorKeys.length === 0) {
+      Stdlib_JsError.throwWithMessage(`Empty operator passed to context.` + entityName + `.getWhere({ ` + apiFieldName + `: {} }). Please provide an operator like { _eq: value }, { _gt: value }, { _lt: value }, { _gte: value }, { _lte: value }, or { _in: [values] }.`);
+    }
+    let throwInvalidOperator = operatorKey => Stdlib_JsError.throwWithMessage(`Invalid operator "` + operatorKey + `" in context.` + entityName + `.getWhere({ ` + apiFieldName + `: { ` + operatorKey + `: ... } }). Valid operators are _eq, _gt, _lt, _gte, _lte, _in.`);
+    operatorKeys.forEach(operatorKey => {
+      switch (operatorKey) {
+        case "_eq" :
+        case "_gt" :
+        case "_gte" :
+        case "_in" :
+        case "_lt" :
+        case "_lte" :
+          return;
+        default:
+          return throwInvalidOperator(operatorKey);
+      }
+    });
+    let match = Table.getFieldByApiName(table, apiFieldName);
+    if (match !== undefined) {
+      if (match.TAG === "Field") {
+        let match$1 = match._0;
+        if (match$1.isPrimaryKey || match$1.isIndex || match$1.linkedEntity !== undefined) {
+          
+        } else {
+          Stdlib_JsError.throwWithMessage(`The field "` + apiFieldName + `" on entity "` + entityName + `" does not have an index. To use it in getWhere(), add the @index directive in your schema.graphql:\n\n  ` + apiFieldName + `: ... @index\n\nThen run 'pnpm envio codegen' to regenerate.`);
+        }
+      } else {
+        Stdlib_JsError.throwWithMessage(`The field "` + apiFieldName + `" on entity "` + entityName + `" is a derived field and cannot be used in getWhere(). Use the source entity's indexed field instead.`);
+      }
+    } else {
+      Stdlib_JsError.throwWithMessage(`Invalid field "` + apiFieldName + `" in context.` + entityName + `.getWhere(). The field doesn't exist. ` + codegenHelpMessage);
+    }
+    return operatorKeys.map(operatorKey => {
+      let fieldValue = operatorObj[operatorKey];
+      let valueName = getUndefinedOrNullName(fieldValue);
+      if (valueName !== undefined) {
+        throwUnsupportedGetWhereValue(valueName, entityName, `{ ` + apiFieldName + `: { ` + operatorKey + `: ` + valueName + ` } }`, undefined);
+      }
+      switch (operatorKey) {
+        case "_eq" :
+          return [{
+              operator: "=",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            }];
+        case "_gt" :
+          return [{
+              operator: ">",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            }];
+        case "_gte" :
+          return [
+            {
+              operator: "=",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            },
+            {
+              operator: ">",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            }
+          ];
+        case "_in" :
+          if (!Array.isArray(fieldValue)) {
+            Stdlib_JsError.throwWithMessage(`Invalid value passed to context.` + entityName + `.getWhere({ ` + apiFieldName + `: { _in: ... } }). The _in operator expects an array of values.`);
+          }
+          return fieldValue.map((fieldValue, index) => {
+            let valueName = getUndefinedOrNullName(fieldValue);
+            if (valueName !== undefined) {
+              throwUnsupportedGetWhereValue(valueName, entityName, `{ ` + apiFieldName + `: { _in: [...] } }`, ` The ` + valueName + ` value is at index ` + index.toString() + ` of the _in array.`);
+            }
+            return {
+              operator: "=",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            };
+          });
+        case "_lt" :
+          return [{
+              operator: "<",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            }];
+        case "_lte" :
+          return [
+            {
+              operator: "=",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            },
+            {
+              operator: "<",
+              fieldName: apiFieldName,
+              fieldValue: fieldValue
+            }
+          ];
+        default:
+          return throwInvalidOperator(operatorKey);
+      }
+    });
+  });
+  return Stdlib_Array.reduce(filterGroups, [[]], (combinations, group) => combinations.flatMap(combination => group.map(filter => combination.concat([filter])))).map(filters => {
+    if (filters.length !== 1) {
+      return {
+        operator: "and",
+        filters: filters
+      };
+    } else {
+      return filters[0];
+    }
+  });
+}
+
+function printOperationFilter(filter, paramsCount) {
+  switch (filter.operator) {
+    case "=" :
+      paramsCount.contents = paramsCount.contents + 1 | 0;
+      return filter.fieldName + `: $` + paramsCount.contents.toString();
+    case ">" :
+      paramsCount.contents = paramsCount.contents + 1 | 0;
+      return filter.fieldName + `: {_gt: $` + paramsCount.contents.toString() + `}`;
+    case "<" :
+      paramsCount.contents = paramsCount.contents + 1 | 0;
+      return filter.fieldName + `: {_lt: $` + paramsCount.contents.toString() + `}`;
+    case "in" :
+      paramsCount.contents = paramsCount.contents + 1 | 0;
+      return filter.fieldName + `: {_in: $` + paramsCount.contents.toString() + `}`;
+    case "and" :
+      let filters = filter.filters;
+      let acc = "";
+      for (let idx = 0, idx_finish = filters.length; idx < idx_finish; ++idx) {
+        let part = printOperationFilter(filters[idx], paramsCount);
+        acc = acc === "" ? part : acc + `, ` + part;
+      }
+      return acc;
+  }
+}
+
+function toOperationKey(filter, entityName) {
+  switch (filter.operator) {
+    case "=" :
+      return entityName + `.getWhere({` + filter.fieldName + `: $1})`;
+    case ">" :
+      return entityName + `.getWhere({` + filter.fieldName + `: {_gt: $1}})`;
+    case "<" :
+      return entityName + `.getWhere({` + filter.fieldName + `: {_lt: $1}})`;
+    case "in" :
+      return entityName + `.getWhere({` + filter.fieldName + `: {_in: $1}})`;
+    case "and" :
+      return entityName + `.getWhere({` + printOperationFilter(filter, {
+        contents: 0
+      }) + `})`;
+  }
+}
+
+function getParams(filter) {
+  switch (filter.operator) {
+    case "in" :
+      return filter.fieldValue;
+    case "and" :
+      let acc = [];
+      let collect = filter => {
+        switch (filter.operator) {
+          case "and" :
+            filter.filters.forEach(collect);
+            return;
+          default:
+            acc.push(filter.fieldValue);
+            return;
+        }
+      };
+      collect(filter);
+      return acc;
+    default:
+      return [filter.fieldValue];
+  }
+}
+
+function throwUnmergeable(filter) {
+  return Stdlib_JsError.throwWithMessage(`Unexpected filter ` + toString$2(filter) + ` in a merged batch. Filters batched into a single query must use the same operator and field.`);
+}
+
+function merge(filters) {
+  let len = filters.length;
+  if (len === 1) {
+    return filters;
+  }
+  if (len === 0) {
+    return filters;
+  }
+  let match = filters[0];
+  switch (match.operator) {
+    case "=" :
+      return [{
+          operator: "in",
+          fieldName: match.fieldName,
+          fieldValue: filters.map(filter => {
+            if (filter.operator === "=") {
+              return filter.fieldValue;
+            } else {
+              return throwUnmergeable(filter);
+            }
+          })
+        }];
+    case "in" :
+      return [{
+          operator: "in",
+          fieldName: match.fieldName,
+          fieldValue: filters.map(filter => {
+            if (filter.operator === "in") {
+              return filter.fieldValue;
+            } else {
+              return throwUnmergeable(filter);
+            }
+          }).flat()
+        }];
+    default:
+      return filters;
+  }
+}
+
+function matches(filter, entity) {
+  switch (filter.operator) {
+    case "=" :
+      return eq(entity[filter.fieldName], filter.fieldValue);
+    case ">" :
+      return gt(entity[filter.fieldName], filter.fieldValue);
+    case "<" :
+      return lt(entity[filter.fieldName], filter.fieldValue);
+    case "in" :
+      let entityFieldValue = entity[filter.fieldName];
+      return filter.fieldValue.some(fieldValue => eq(entityFieldValue, fieldValue));
+    case "and" :
+      let filters = filter.filters;
+      if (filters.length !== 0) {
+        return filters.every(filter => matches(filter, entity));
+      } else {
+        return Stdlib_JsError.throwWithMessage(`The "and" filter must contain at least one nested filter.`);
+      }
+  }
+}
+
+function mapValues(filter, mapValue) {
+  switch (filter.operator) {
+    case "=" :
+      let fieldName = filter.fieldName;
+      return {
+        operator: "=",
+        fieldName: fieldName,
+        fieldValue: mapValue(fieldName, filter.fieldValue, false)
+      };
+    case ">" :
+      let fieldName$1 = filter.fieldName;
+      return {
+        operator: ">",
+        fieldName: fieldName$1,
+        fieldValue: mapValue(fieldName$1, filter.fieldValue, false)
+      };
+    case "<" :
+      let fieldName$2 = filter.fieldName;
+      return {
+        operator: "<",
+        fieldName: fieldName$2,
+        fieldValue: mapValue(fieldName$2, filter.fieldValue, false)
+      };
+    case "in" :
+      let fieldName$3 = filter.fieldName;
+      return {
+        operator: "in",
+        fieldName: fieldName$3,
+        fieldValue: mapValue(fieldName$3, filter.fieldValue, true)
+      };
+    case "and" :
+      return {
+        operator: "and",
+        filters: filter.filters.map(filter => mapValues(filter, mapValue))
+      };
+  }
+}
+
+export {
+  FieldValue,
+  toString$2 as toString,
+  valuesCount,
+  codegenHelpMessage,
+  getUndefinedOrNullName,
+  throwUnsupportedGetWhereValue,
+  parseGetWhereOrThrow,
+  printOperationFilter,
+  toOperationKey,
+  getParams,
+  throwUnmergeable,
+  merge,
+  matches,
+  mapValues,
+}
+/* Table Not a pure module */

package/src/db/EntityHistory.res

@@ -53,7 +53,7 @@ let historyTablePrefix = "envio_history_"
 let historyTableName = (~entityName, ~entityIndex) => {
   let fullName = historyTablePrefix ++ entityName
   if fullName->String.length > maxPgTableNameLength {
-    let entityIndexStr = entityIndex->Belt.Int.toString
+    let entityIndexStr = entityIndex->Int.toString
     fullName->Js.String.slice(~from=0, ~to_=maxPgTableNameLength - entityIndexStr->String.length) ++
       entityIndexStr
   } else {

package/src/db/EntityHistory.res.mjs

@@ -67,7 +67,7 @@ function historyTableName(entityName, entityIndex) {
   if (fullName.length <= 63) {
     return fullName;
   }
-  let entityIndexStr = String(entityIndex);
+  let entityIndexStr = entityIndex.toString();
   return Js_string.slice(0, 63 - entityIndexStr.length | 0, fullName) + entityIndexStr;
 }
 

package/src/db/InternalTable.res

@@ -122,16 +122,16 @@ module Chains = {
       None
     } else {
       // Create column names list
-      let columnNames = fields->Belt.Array.map(field => `"${(field :> string)}"`)
+      let columnNames = fields->Array.map(field => `"${(field :> string)}"`)
 
       // Create VALUES rows for each chain config
-      let valuesRows = chainConfigs->Belt.Array.map(chainConfig => {
+      let valuesRows = chainConfigs->Array.map(chainConfig => {
         let initialValues = initialFromConfig(chainConfig)
-        let values = fields->Belt.Array.map((field: field) => {
+        let values = fields->Array.map((field: field) => {
           let value = initialValues->(Utils.magic: t => dict<unknown>)->Dict.get((field :> string))
           switch typeof(value) {
           | #object => "NULL"
-          | #number => value->(Utils.magic: option<unknown> => int)->Belt.Int.toString
+          | #number => value->(Utils.magic: option<unknown> => int)->Int.toString
           | #bigint => value->(Utils.magic: option<unknown> => bigint)->BigInt.toString
           | #boolean => value->(Utils.magic: option<unknown> => bool) ? "true" : "false"
           | _ => JsError.throwWithMessage("Invalid envio_chains value type")
@@ -153,10 +153,10 @@ VALUES ${valuesRows->Array.joinUnsafe(",\n       ")};`,
 
   let makeMetaFieldsUpdateQuery = (~pgSchema) => {
     // Generate SET clauses with parameter placeholders
-    let setClauses = Belt.Array.mapWithIndex(metaFields, (index, field) => {
+    let setClauses = Array.mapWithIndex(metaFields, (field, index) => {
       let fieldName = (field :> string)
       let paramIndex = index + 2 // +2 because $1 is for id in WHERE clause
-      `"${fieldName}" = $${Belt.Int.toString(paramIndex)}`
+      `"${fieldName}" = $${Int.toString(paramIndex)}`
     })
 
     `UPDATE "${pgSchema}"."${table.tableName}"
@@ -252,10 +252,10 @@ FROM "${pgSchema}"."${EnvioAddresses.table.tableName}";`
   let progressFields: array<progressFields> = [#progress_block, #events_processed, #source_block]
 
   let makeProgressFieldsUpdateQuery = (~pgSchema) => {
-    let setClauses = Belt.Array.mapWithIndex(progressFields, (index, field) => {
+    let setClauses = Array.mapWithIndex(progressFields, (field, index) => {
       let fieldName = (field :> string)
       let paramIndex = index + 2 // +2 because $1 is for id in WHERE clause
-      `"${fieldName}" = $${Belt.Int.toString(paramIndex)}`
+      `"${fieldName}" = $${Int.toString(paramIndex)}`
     })
 
     `UPDATE "${pgSchema}"."${table.tableName}"
@@ -358,7 +358,7 @@ module EnvioInfo = {
       | _ => throw(exn)
       }
     }
-    rows->Belt.Array.get(0)->Belt.Option.map(row => row["config"]->JSON.parseOrThrow)
+    rows->Array.get(0)->Option.map(row => row["config"]->JSON.parseOrThrow)
   }
 
   // Upsert keyed on the fixed id so the table stays a singleton even if
@@ -534,7 +534,7 @@ LIMIT 1;`
       )
       ->(Utils.magic: promise<unknown> => promise<array<{"id": string}>>)
     rawResult->Promise.thenResolve(rows => {
-      rows->Belt.Array.get(0)->Belt.Option.map(row => row["id"]->BigInt.fromStringOrThrow)
+      rows->Array.get(0)->Option.map(row => row["id"]->BigInt.fromStringOrThrow)
     })
   }
 

package/src/db/InternalTable.res.mjs

@@ -4,8 +4,6 @@ import * as Table from "./Table.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Config from "../Config.res.mjs";
 import * as Address from "../Address.res.mjs";
-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_Null from "@rescript/runtime/lib/es6/Stdlib_Null.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
@@ -27,17 +25,17 @@ let fields = [
 ];
 
 let table = Table.mkTable("envio_chains", undefined, [
-  Table.mkField("id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined),
-  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined),
-  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined, undefined),
-  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 function initialFromConfig(chainConfig) {
@@ -60,13 +58,13 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
   if (chainConfigs.length === 0) {
     return;
   }
-  let columnNames = Belt_Array.map(fields, field => `"` + field + `"`);
-  let valuesRows = Belt_Array.map(chainConfigs, chainConfig => {
+  let columnNames = fields.map(field => `"` + field + `"`);
+  let valuesRows = chainConfigs.map(chainConfig => {
     let initialValues = initialFromConfig(chainConfig);
-    let values = Belt_Array.map(fields, field => {
+    let values = fields.map(field => {
       let value = initialValues[field];
       let match = typeof value;
-      if (match === "bigint") {
+      if (match === "number" || match === "bigint") {
         return value.toString();
       } else if (match === "boolean") {
         if (value) {
@@ -76,8 +74,6 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
         }
       } else if (match === "object") {
         return "NULL";
-      } else if (match === "number") {
-        return String(value);
       } else {
         return Stdlib_JsError.throwWithMessage("Invalid envio_chains value type");
       }
@@ -96,9 +92,9 @@ let metaFields = [
 ];
 
 function makeMetaFieldsUpdateQuery(pgSchema) {
-  let setClauses = Belt_Array.mapWithIndex(metaFields, (index, field) => {
+  let setClauses = metaFields.map((field, index) => {
     let paramIndex = index + 2 | 0;
-    return `"` + field + `" = $` + String(paramIndex);
+    return `"` + field + `" = $` + paramIndex.toString();
   });
   return `UPDATE "` + pgSchema + `"."` + table.tableName + `"
 SET ` + setClauses.join(",\n    ") + `
@@ -170,9 +166,9 @@ let progressFields = [
 ];
 
 function makeProgressFieldsUpdateQuery(pgSchema) {
-  let setClauses = Belt_Array.mapWithIndex(progressFields, (index, field) => {
+  let setClauses = progressFields.map((field, index) => {
     let paramIndex = index + 2 | 0;
-    return `"` + field + `" = $` + String(paramIndex);
+    return `"` + field + `" = $` + paramIndex.toString();
   });
   return `UPDATE "` + pgSchema + `"."` + table.tableName + `"
 SET ` + setClauses.join(",\n    ") + `
@@ -227,8 +223,8 @@ let Chains = {
 };
 
 let table$1 = Table.mkTable("envio_info", undefined, [
-  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 let undefinedTableSqlState = "42P01";
@@ -250,7 +246,7 @@ async function read(sql, pgSchema) {
       throw exn;
     }
   }
-  return Belt_Option.map(Belt_Array.get(rows, 0), row => JSON.parse(row.config));
+  return Stdlib_Option.map(rows[0], row => JSON.parse(row.config));
 }
 
 function write(sql, pgSchema, envioInfo) {
@@ -276,11 +272,11 @@ let dbSchema = S$RescriptSchema.object(s => ({
 }));
 
 let table$2 = Table.mkTable("envio_checkpoints", undefined, [
-  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined, undefined),
-  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined, undefined),
-  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 function makeGetReorgCheckpointsQuery(pgSchema) {
@@ -351,7 +347,7 @@ function getRollbackTargetCheckpoint(sql, pgSchema, reorgChainId, lastKnownValid
     reorgChainId,
     lastKnownValidBlockNumber
   ], {prepare: true});
-  return rawResult.then(rows => Belt_Option.map(Belt_Array.get(rows, 0), row => BigInt(row.id)));
+  return rawResult.then(rows => Stdlib_Option.map(rows[0], row => BigInt(row.id)));
 }
 
 function makeGetRollbackProgressDiffQuery(pgSchema) {
@@ -401,19 +397,19 @@ let schema = S$RescriptSchema.schema(s => ({
 }));
 
 let table$3 = Table.mkTable("raw_events", undefined, [
-  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined, undefined)
+  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 let RawEvents = {