envio 3.1.2 → 3.2.0

package/src/UserContext.res

@@ -1,5 +1,3 @@
-let codegenHelpMessage = `Rerun 'pnpm dev' to update generated code after schema.graphql changes.`
-
 type contextParams = {
   item: Internal.item,
   checkpointId: Internal.checkpointId,
@@ -77,126 +75,29 @@ type entityContextParams = {
 
 let getWhereHandler = (params: entityContextParams, filter: dict<dict<unknown>>) => {
   let entityConfig = params.entityConfig
-  let filterKeys = filter->Dict.keysToArray
-
-  if filterKeys->Array.length === 0 {
-    JsError.throwWithMessage(
-      `Empty filter passed to context.${entityConfig.name}.getWhere(). Please provide a filter like { fieldName: { _eq: value } }.`,
-    )
-  }
-  if filterKeys->Array.length > 1 {
-    JsError.throwWithMessage(
-      `Multiple filter fields passed to context.${entityConfig.name}.getWhere(). Currently only one filter field per call is supported. Received fields: ${filterKeys->Array.joinUnsafe(
-          ", ",
-        )}.`,
-    )
-  }
-
-  let dbFieldName = filterKeys->Array.getUnsafe(0)
-  let operatorObj = filter->Dict.getUnsafe(dbFieldName)
-  let operatorKeys = operatorObj->Dict.keysToArray
-
-  if operatorKeys->Array.length === 0 {
-    JsError.throwWithMessage(
-      `Empty operator passed to context.${entityConfig.name}.getWhere({ ${dbFieldName}: {} }). Please provide an operator like { _eq: value }, { _gt: value }, { _lt: value }, { _gte: value }, { _lte: value }, or { _in: [values] }.`,
-    )
-  }
-  if operatorKeys->Array.length > 1 {
-    JsError.throwWithMessage(
-      `Multiple operators passed to context.${entityConfig.name}.getWhere({ ${dbFieldName}: ... }). Currently only one operator per filter field is supported. Received operators: ${operatorKeys->Array.joinUnsafe(
-          ", ",
-        )}.`,
-    )
-  }
-
-  let operatorKey = operatorKeys->Array.getUnsafe(0)
-
-  let fieldSchema = switch entityConfig.table->Table.getFieldByDbName(dbFieldName) {
-  | None =>
-    JsError.throwWithMessage(
-      `Invalid field "${dbFieldName}" in context.${entityConfig.name}.getWhere(). The field doesn't exist. ${codegenHelpMessage}`,
-    )
-  | Some(DerivedFrom(_)) =>
-    JsError.throwWithMessage(
-      `The field "${dbFieldName}" on entity "${entityConfig.name}" is a derived field and cannot be used in getWhere(). Use the source entity's indexed field instead.`,
-    )
-  | Some(Field({isIndex: false, linkedEntity: None})) =>
-    JsError.throwWithMessage(
-      `The field "${dbFieldName}" on entity "${entityConfig.name}" does not have an index. To use it in getWhere(), add the @index directive in your schema.graphql:\n\n  ${dbFieldName}: ... @index\n\nThen run 'pnpm envio codegen' to regenerate.`,
-    )
-  | Some(Field({fieldSchema})) => fieldSchema
-  }
-
-  if operatorKey === "_in" {
-    let fieldValues =
-      operatorObj
-      ->Dict.getUnsafe(operatorKey)
-      ->(Utils.magic: unknown => array<unknown>)
 
-    fieldValues
-    ->Array.map(fieldValue =>
-      LoadLayer.loadByField(
-        ~loadManager=params.loadManager,
-        ~persistence=params.persistence,
-        ~operator=Eq,
-        ~entityConfig,
-        ~fieldName=dbFieldName,
-        ~fieldValueSchema=fieldSchema,
-        ~inMemoryStore=params.inMemoryStore,
-        ~shouldGroup=params.isPreload,
-        ~item=params.item,
-        ~fieldValue,
-      )
-    )
-    ->Promise.all
-    ->Promise.thenResolve(results => results->Belt.Array.concatMany)
-  } else if operatorKey === "_gte" || operatorKey === "_lte" {
-    // _gte and _lte are composed from Eq + Gt/Lt
-    let rangeOperator: TableIndices.Operator.t = operatorKey === "_gte" ? Gt : Lt
-    let fieldValue = operatorObj->Dict.getUnsafe(operatorKey)
-
-    let loadWithOperator = operator =>
-      LoadLayer.loadByField(
-        ~loadManager=params.loadManager,
-        ~persistence=params.persistence,
-        ~operator,
-        ~entityConfig,
-        ~fieldName=dbFieldName,
-        ~fieldValueSchema=fieldSchema,
-        ~inMemoryStore=params.inMemoryStore,
-        ~shouldGroup=params.isPreload,
-        ~item=params.item,
-        ~fieldValue,
-      )
-
-    [loadWithOperator(Eq), loadWithOperator(rangeOperator)]
-    ->Promise.all
-    ->Promise.thenResolve(results => results->Belt.Array.concatMany)
-  } else {
-    let operator: TableIndices.Operator.t = switch operatorKey {
-    | "_eq" => Eq
-    | "_gt" => Gt
-    | "_lt" => Lt
-    | _ =>
-      JsError.throwWithMessage(
-        `Invalid operator "${operatorKey}" in context.${entityConfig.name}.getWhere({ ${dbFieldName}: { ${operatorKey}: ... } }). Valid operators are _eq, _gt, _lt, _gte, _lte, _in.`,
-      )
-    }
-
-    let fieldValue = operatorObj->Dict.getUnsafe(operatorKey)
-
-    LoadLayer.loadByField(
+  @inline
+  let loadWithFilter = filter =>
+    LoadLayer.loadByFilter(
       ~loadManager=params.loadManager,
       ~persistence=params.persistence,
-      ~operator,
       ~entityConfig,
-      ~fieldName=dbFieldName,
-      ~fieldValueSchema=fieldSchema,
       ~inMemoryStore=params.inMemoryStore,
       ~shouldGroup=params.isPreload,
       ~item=params.item,
-      ~fieldValue,
+      ~filter,
     )
+
+  switch filter->EntityFilter.parseGetWhereOrThrow(
+    ~entityName=entityConfig.name,
+    ~table=entityConfig.table,
+  ) {
+  | [single] => loadWithFilter(single)
+  | filters =>
+    filters
+    ->Array.map(filter => loadWithFilter(filter))
+    ->Promise.all
+    ->Promise.thenResolve(results => results->Array.flat)
   }
 }
 
@@ -285,7 +186,7 @@ let entityTraps: Utils.Proxy.traps<entityContextParams> = {
               | Some(entity) => entity
               | None =>
                 JsError.throwWithMessage(
-                  message->Belt.Option.getWithDefault(
+                  message->Option.getOr(
                     `Entity '${params.entityConfig.name}' with ID '${entityId}' is expected to exist.`,
                   ),
                 )
@@ -389,7 +290,7 @@ let handlerTraps: Utils.Proxy.traps<contextParams> = {
         ->(Utils.magic: entityContextParams => unknown)
       | None =>
         JsError.throwWithMessage(
-          `Invalid context access by '${prop}' property. ${codegenHelpMessage}`,
+          `Invalid context access by '${prop}' property. ${EntityFilter.codegenHelpMessage}`,
         )
       }
     }
@@ -458,7 +359,7 @@ let contractRegisterChainTraps: Utils.Proxy.traps<contractRegisterParams> = {
         {"add": addFn}->(Utils.magic: {"add": Address.t => unit} => unknown)
       } else {
         JsError.throwWithMessage(
-          `Invalid contract name '${prop}' on context.chain. ${codegenHelpMessage}`,
+          `Invalid contract name '${prop}' on context.chain. ${EntityFilter.codegenHelpMessage}`,
         )
       }
     }
@@ -481,7 +382,7 @@ let contractRegisterTraps: Utils.Proxy.traps<contractRegisterParams> = {
       ->(Utils.magic: contractRegisterParams => unknown)
     | _ =>
       JsError.throwWithMessage(
-        `Invalid context access by '${prop}' property. Use context.chain.ContractName.add(address) to register contracts. ${codegenHelpMessage}`,
+        `Invalid context access by '${prop}' property. Use context.chain.ContractName.add(address) to register contracts. ${EntityFilter.codegenHelpMessage}`,
       )
     }
   },

package/src/UserContext.res.mjs

@@ -1,22 +1,19 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Table from "./db/Table.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Address from "./Address.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as Internal from "./Internal.res.mjs";
 import * as LoadLayer from "./LoadLayer.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 EntityFilter from "./db/EntityFilter.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
 import * as InMemoryStore from "./InMemoryStore.res.mjs";
 import * as InMemoryTable from "./InMemoryTable.res.mjs";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-let codegenHelpMessage = `Rerun 'pnpm dev' to update generated code after schema.graphql changes.`;
-
 let paramsByThis = new WeakMap();
 
 let effectContextPrototype = (Object.create(null));
@@ -53,64 +50,12 @@ function initEffect(params) {
 
 function getWhereHandler(params, filter) {
   let entityConfig = params.entityConfig;
-  let filterKeys = Object.keys(filter);
-  if (filterKeys.length === 0) {
-    Stdlib_JsError.throwWithMessage(`Empty filter passed to context.` + entityConfig.name + `.getWhere(). Please provide a filter like { fieldName: { _eq: value } }.`);
-  }
-  if (filterKeys.length > 1) {
-    Stdlib_JsError.throwWithMessage(`Multiple filter fields passed to context.` + entityConfig.name + `.getWhere(). Currently only one filter field per call is supported. Received fields: ` + filterKeys.join(", ") + `.`);
-  }
-  let dbFieldName = filterKeys[0];
-  let operatorObj = filter[dbFieldName];
-  let operatorKeys = Object.keys(operatorObj);
-  if (operatorKeys.length === 0) {
-    Stdlib_JsError.throwWithMessage(`Empty operator passed to context.` + entityConfig.name + `.getWhere({ ` + dbFieldName + `: {} }). Please provide an operator like { _eq: value }, { _gt: value }, { _lt: value }, { _gte: value }, { _lte: value }, or { _in: [values] }.`);
-  }
-  if (operatorKeys.length > 1) {
-    Stdlib_JsError.throwWithMessage(`Multiple operators passed to context.` + entityConfig.name + `.getWhere({ ` + dbFieldName + `: ... }). Currently only one operator per filter field is supported. Received operators: ` + operatorKeys.join(", ") + `.`);
-  }
-  let operatorKey = operatorKeys[0];
-  let match = Table.getFieldByDbName(entityConfig.table, dbFieldName);
-  let fieldSchema;
-  if (match !== undefined) {
-    if (match.TAG === "Field") {
-      let match$1 = match._0;
-      fieldSchema = match$1.isIndex || match$1.linkedEntity !== undefined ? match$1.fieldSchema : Stdlib_JsError.throwWithMessage(`The field "` + dbFieldName + `" on entity "` + entityConfig.name + `" does not have an index. To use it in getWhere(), add the @index directive in your schema.graphql:\n\n  ` + dbFieldName + `: ... @index\n\nThen run 'pnpm envio codegen' to regenerate.`);
-    } else {
-      fieldSchema = Stdlib_JsError.throwWithMessage(`The field "` + dbFieldName + `" on entity "` + entityConfig.name + `" is a derived field and cannot be used in getWhere(). Use the source entity's indexed field instead.`);
-    }
+  let filters = EntityFilter.parseGetWhereOrThrow(filter, entityConfig.name, entityConfig.table);
+  if (filters.length !== 1) {
+    return Promise.all(filters.map(filter => LoadLayer.loadByFilter(params.loadManager, params.persistence, entityConfig, params.inMemoryStore, params.isPreload, params.item, filter))).then(results => results.flat());
   } else {
-    fieldSchema = Stdlib_JsError.throwWithMessage(`Invalid field "` + dbFieldName + `" in context.` + entityConfig.name + `.getWhere(). The field doesn't exist. ` + codegenHelpMessage);
-  }
-  if (operatorKey === "_in") {
-    let fieldValues = operatorObj[operatorKey];
-    return Promise.all(fieldValues.map(fieldValue => LoadLayer.loadByField(params.loadManager, params.persistence, "Eq", entityConfig, params.inMemoryStore, dbFieldName, fieldSchema, params.isPreload, params.item, fieldValue))).then(Belt_Array.concatMany);
-  }
-  if (operatorKey === "_gte" || operatorKey === "_lte") {
-    let rangeOperator = operatorKey === "_gte" ? "Gt" : "Lt";
-    let fieldValue = operatorObj[operatorKey];
-    let loadWithOperator = operator => LoadLayer.loadByField(params.loadManager, params.persistence, operator, entityConfig, params.inMemoryStore, dbFieldName, fieldSchema, params.isPreload, params.item, fieldValue);
-    return Promise.all([
-      loadWithOperator("Eq"),
-      loadWithOperator(rangeOperator)
-    ]).then(Belt_Array.concatMany);
-  }
-  let operator;
-  switch (operatorKey) {
-    case "_eq" :
-      operator = "Eq";
-      break;
-    case "_gt" :
-      operator = "Gt";
-      break;
-    case "_lt" :
-      operator = "Lt";
-      break;
-    default:
-      operator = Stdlib_JsError.throwWithMessage(`Invalid operator "` + operatorKey + `" in context.` + entityConfig.name + `.getWhere({ ` + dbFieldName + `: { ` + operatorKey + `: ... } }). Valid operators are _eq, _gt, _lt, _gte, _lte, _in.`);
+    return LoadLayer.loadByFilter(params.loadManager, params.persistence, entityConfig, params.inMemoryStore, params.isPreload, params.item, filters[0]);
   }
-  let fieldValue$1 = operatorObj[operatorKey];
-  return LoadLayer.loadByField(params.loadManager, params.persistence, operator, entityConfig, params.inMemoryStore, dbFieldName, fieldSchema, params.isPreload, params.item, fieldValue$1);
 }
 
 function noopSet(_entity) {
@@ -171,7 +116,7 @@ let entityTraps_get = (params, prop) => {
           if (entity !== undefined) {
             return entity;
           } else {
-            return Stdlib_JsError.throwWithMessage(Belt_Option.getWithDefault(message, `Entity '` + params.entityConfig.name + `' with ID '` + entityId + `' is expected to exist.`));
+            return Stdlib_JsError.throwWithMessage(Stdlib_Option.getOr(message, `Entity '` + params.entityConfig.name + `' with ID '` + entityId + `' is expected to exist.`));
           }
         });
       }
@@ -226,7 +171,7 @@ let handlerTraps_get = (params, prop) => {
           entityConfig: entityConfig
         }, entityTraps);
       } else {
-        return Stdlib_JsError.throwWithMessage(`Invalid context access by '` + prop + `' property. ` + codegenHelpMessage);
+        return Stdlib_JsError.throwWithMessage(`Invalid context access by '` + prop + `' property. ` + EntityFilter.codegenHelpMessage);
       }
   }
 };
@@ -261,7 +206,7 @@ let contractRegisterChainTraps_get = (params, prop) => {
       add: makeAddFunction(params, prop)
     };
   } else {
-    return Stdlib_JsError.throwWithMessage(`Invalid contract name '` + prop + `' on context.chain. ` + codegenHelpMessage);
+    return Stdlib_JsError.throwWithMessage(`Invalid contract name '` + prop + `' on context.chain. ` + EntityFilter.codegenHelpMessage);
   }
 };
 
@@ -279,7 +224,7 @@ let contractRegisterTraps_get = (params, prop) => {
     case "log" :
       return Logging.getUserLogger(params.item);
     default:
-      return Stdlib_JsError.throwWithMessage(`Invalid context access by '` + prop + `' property. Use context.chain.ContractName.add(address) to register contracts. ` + codegenHelpMessage);
+      return Stdlib_JsError.throwWithMessage(`Invalid context access by '` + prop + `' property. Use context.chain.ContractName.add(address) to register contracts. ` + EntityFilter.codegenHelpMessage);
   }
 };
 
@@ -299,7 +244,6 @@ function getContractRegisterArgs(params) {
 }
 
 export {
-  codegenHelpMessage,
   paramsByThis,
   effectContextPrototype,
   initEffect,

package/src/Utils.res

@@ -267,18 +267,18 @@ module Array = {
 
       let rec loop = (i, j, k) => {
         if i < Array.length(xs) && j < Array.length(ys) {
-          if f(xs->Belt.Array.getUnsafe(i), ys->Belt.Array.getUnsafe(j)) {
-            result->Belt.Array.setUnsafe(k, xs->Belt.Array.getUnsafe(i))
+          if f(xs->Array.getUnsafe(i), ys->Array.getUnsafe(j)) {
+            result->Array.setUnsafe(k, xs->Array.getUnsafe(i))
             loop(i + 1, j, k + 1)
           } else {
-            result->Belt.Array.setUnsafe(k, ys->Belt.Array.getUnsafe(j))
+            result->Array.setUnsafe(k, ys->Array.getUnsafe(j))
             loop(i, j + 1, k + 1)
           }
         } else if i < Array.length(xs) {
-          result->Belt.Array.setUnsafe(k, xs->Belt.Array.getUnsafe(i))
+          result->Array.setUnsafe(k, xs->Array.getUnsafe(i))
           loop(i + 1, j, k + 1)
         } else if j < Array.length(ys) {
-          result->Belt.Array.setUnsafe(k, ys->Belt.Array.getUnsafe(j))
+          result->Array.setUnsafe(k, ys->Array.getUnsafe(j))
           loop(i, j + 1, k + 1)
         }
       }
@@ -296,7 +296,7 @@ module Array = {
   Creates a shallow copy of the array and sets the value at the given index
   */
   let setIndexImmutable = (arr: array<'a>, index: int, value: 'a): array<'a> => {
-    let shallowCopy = arr->Belt.Array.copy
+    let shallowCopy = arr->Array.copy
     shallowCopy->Array.setUnsafe(index, value)
     shallowCopy
   }
@@ -308,7 +308,7 @@ module Array = {
       } else {
         switch results->Array.getUnsafe(index) {
         | Ok(value) => {
-            output->Belt.Array.setUnsafe(index, value)
+            output->Array.setUnsafe(index, value)
             loop(index + 1, output)
           }
         | Error(_) as err => err->(magic: result<'a, 'b> => result<array<'a>, 'b>)
@@ -316,14 +316,14 @@ module Array = {
       }
     }
 
-    loop(0, Belt.Array.makeUninitializedUnsafe(results->Array.length))
+    loop(0, jsArrayCreate(results->Array.length))
   }
 
   /**
 Helper to check if a value exists in an array
 */
   let includes = (arr: array<'a>, val: 'a) =>
-    arr->Array.find(item => item == val)->Belt.Option.isSome
+    arr->Array.find(item => item == val)->Stdlib.Option.isSome
 
   let isEmpty = (arr: array<_>) =>
     switch arr {
@@ -339,7 +339,7 @@ Helper to check if a value exists in an array
 
   let awaitEach = async (arr: array<'a>, fn: 'a => promise<unit>) => {
     for i in 0 to arr->Array.length - 1 {
-      let item = arr->Belt.Array.getUnsafe(i)
+      let item = arr->Array.getUnsafe(i)
       await item->fn
     }
   }
@@ -357,10 +357,10 @@ Helper to check if a value exists in an array
     }
   }
 
-  let last = (arr: array<'a>): option<'a> => arr->Belt.Array.get(arr->Array.length - 1)
-  let first = (arr: array<'a>): option<'a> => arr->Belt.Array.get(0)
+  let last = (arr: array<'a>): option<'a> => arr->Array.get(arr->Array.length - 1)
+  let first = (arr: array<'a>): option<'a> => arr->Array.get(0)
 
-  let lastUnsafe = (arr: array<'a>): 'a => arr->Belt.Array.getUnsafe(arr->Array.length - 1)
+  let lastUnsafe = (arr: array<'a>): 'a => arr->Array.getUnsafe(arr->Array.length - 1)
   let firstUnsafe = (arr: array<'a>): 'a => arr->Array.getUnsafe(0)
 
   let findReverseWithIndex = (arr: array<'a>, fn: 'a => bool): option<('a, int)> => {
@@ -368,7 +368,7 @@ Helper to check if a value exists in an array
       if index < 0 {
         None
       } else {
-        let item = arr->Belt.Array.getUnsafe(index)
+        let item = arr->Array.getUnsafe(index)
         if fn(item) {
           Some((item, index))
         } else {
@@ -455,7 +455,7 @@ module Url = {
     let regex = /https?:\/\/([^\/?]+).*/
     switch RegExp.exec(regex, url) {
     | Some(result) =>
-      switch RegExp.Result.matches(result)->Belt.Array.get(0) {
+      switch RegExp.Result.matches(result)->Array.get(0) {
       | Some(Some(host)) => Some(host)
       | Some(None) | None => None
       }

package/src/Utils.res.mjs

@@ -1,11 +1,10 @@
 import packageJson from '../package.json' with { type: 'json' }
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-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_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_String from "@rescript/runtime/lib/es6/Stdlib_String.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
@@ -260,14 +259,14 @@ let clearInPlace = ((arr) => {
   });
 
 function setIndexImmutable(arr, index, value) {
-  let shallowCopy = arr.slice(0);
+  let shallowCopy = arr.slice();
   shallowCopy[index] = value;
   return shallowCopy;
 }
 
 function transposeResults(results) {
   let _index = 0;
-  let output = new Array(results.length);
+  let output = Array(results.length);
   while (true) {
     let index = _index;
     if (index >= results.length) {
@@ -287,7 +286,7 @@ function transposeResults(results) {
 }
 
 function includes(arr, val) {
-  return Belt_Option.isSome(arr.find(item => Primitive_object.equal(item, val)));
+  return Stdlib_Option.isSome(arr.find(item => Primitive_object.equal(item, val)));
 }
 
 function isEmpty$1(arr) {
@@ -314,11 +313,11 @@ function removeAtIndex(array, index) {
 }
 
 function last(arr) {
-  return Belt_Array.get(arr, arr.length - 1 | 0);
+  return arr[arr.length - 1 | 0];
 }
 
 function first(arr) {
-  return Belt_Array.get(arr, 0);
+  return arr[0];
 }
 
 function lastUnsafe(arr) {
@@ -429,7 +428,7 @@ function getHostFromUrl(url) {
   if (result == null) {
     return;
   }
-  let match = Belt_Array.get(result.slice(1), 0);
+  let match = result.slice(1)[0];
   if (match === undefined) {
     return;
   }

package/src/adapters/MarkBatchProcessedAdapter.res

@@ -0,0 +1,5 @@
+let make = (~inMemoryStore: InMemoryStore.t): Ports.MarkBatchProcessed.t =>
+  () => {
+    inMemoryStore.isProcessing = false
+    inMemoryStore.processedBatchesCount = inMemoryStore.processedBatchesCount + 1
+  }

package/src/adapters/MarkBatchProcessedAdapter.res.mjs

@@ -0,0 +1,14 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+function make(inMemoryStore) {
+  return () => {
+    inMemoryStore.isProcessing = false;
+    inMemoryStore.processedBatchesCount = inMemoryStore.processedBatchesCount + 1 | 0;
+  };
+}
+
+export {
+  make,
+}
+/* No side effect */

package/src/bindings/BigDecimal.res

@@ -22,7 +22,7 @@ type rec t = {
 // Methods
 @send external toString: t => string = "toString"
 @send external toFixed: t => string = "toFixed"
-let toInt = (b: t): option<int> => b->toString->Belt.Int.fromString
+let toInt = (b: t): option<int> => b->toString->Int.fromString
 @send external toNumber: t => float = "toNumber"
 
 // Arithmetic Operations

package/src/bindings/BigDecimal.res.mjs

@@ -1,11 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Belt_Int from "@rescript/runtime/lib/es6/Belt_Int.js";
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import BignumberJs from "bignumber.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
 function toInt(b) {
-  return Belt_Int.fromString(b.toString());
+  return Stdlib_Int.fromString(b.toString(), undefined);
 }
 
 function notEquals(a, b) {

package/src/bindings/ClickHouse.res

@@ -103,14 +103,16 @@ let getClickHouseFieldType = (
   isNullable ? `Nullable(${baseType})` : baseType
 }
 
-// Creates an entity schema from table definition, using clickHouseDate for Date fields
+// Creates an entity schema from table definition, using clickHouseDate for Date fields.
+// Serialized keys are the db column names, while the entity values are keyed
+// by API field names (they only differ when column renaming is configured).
 let makeClickHouseEntitySchema = (table: Table.table): S.t<Internal.entity> => {
-  S.schema(s => {
+  S.object(s => {
     let dict = Dict.make()
     table.fields->Array.forEach(field => {
       switch field {
       | Field(f) => {
-          let fieldName = f->Table.getDbFieldName
+          let fieldName = f->Table.getClickHouseDbFieldName
           let fieldSchema = switch f.fieldType {
           | Date => {
               let dateSchema = Utils.Schema.clickHouseDate->S.toUnknown
@@ -142,7 +144,7 @@ let makeClickHouseEntitySchema = (table: Table.table): S.t<Internal.entity> => {
             }
           | _ => f.fieldSchema
           }
-          dict->Dict.set(fieldName, s.matches(fieldSchema))
+          dict->Dict.set(f->Table.getApiFieldName, s.field(fieldName, fieldSchema))
         }
       | DerivedFrom(_) => () // Skip derived fields
       }
@@ -316,7 +318,7 @@ let makeCreateHistoryTableQuery = (
     switch field {
     | Field(field) =>
       Some({
-        let fieldName = field->Table.getDbFieldName
+        let fieldName = field->Table.getClickHouseDbFieldName
         let clickHouseType = getClickHouseFieldType(
           ~fieldType=field.fieldType,
           ~isNullable=field.isNullable,
@@ -399,7 +401,7 @@ let makeCreateViewQuery = (~entityConfig: Internal.entityConfig, ~database: stri
     ->Array.filterMap(field => {
       switch field {
       | Field(field) => {
-          let fieldName = field->Table.getDbFieldName
+          let fieldName = field->Table.getClickHouseDbFieldName
           Some(`\`${fieldName}\``)
         }
       | DerivedFrom(_) => None

package/src/bindings/ClickHouse.res.mjs

@@ -82,14 +82,14 @@ function getClickHouseFieldType(fieldType, isNullable, isArray) {
 }
 
 function makeClickHouseEntitySchema(table) {
-  return S$RescriptSchema.schema(s => {
+  return S$RescriptSchema.object(s => {
     let dict = {};
     table.fields.forEach(field => {
       if (field.TAG !== "Field") {
         return;
       }
       let f = field._0;
-      let fieldName = Table.getDbFieldName(f);
+      let fieldName = Table.getClickHouseDbFieldName(f);
       let match = f.fieldType;
       let fieldSchema;
       if (typeof match !== "object") {
@@ -114,7 +114,7 @@ function makeClickHouseEntitySchema(table) {
       } else {
         fieldSchema = f.fieldSchema;
       }
-      dict[fieldName] = s.m(fieldSchema);
+      dict[Table.getApiFieldName(f)] = s.f(fieldName, fieldSchema);
     });
     return dict;
   });
@@ -243,7 +243,7 @@ function makeCreateHistoryTableQuery(entityConfig, database, replicatedOpt) {
       return;
     }
     let field$1 = field._0;
-    let fieldName = Table.getDbFieldName(field$1);
+    let fieldName = Table.getClickHouseDbFieldName(field$1);
     let clickHouseType = getClickHouseFieldType(field$1.fieldType, field$1.isNullable, field$1.isArray);
     return `\`` + fieldName + `\` ` + clickHouseType;
   });
@@ -280,7 +280,7 @@ function makeCreateViewQuery(entityConfig, database) {
     if (field.TAG !== "Field") {
       return;
     }
-    let fieldName = Table.getDbFieldName(field._0);
+    let fieldName = Table.getClickHouseDbFieldName(field._0);
     return `\`` + fieldName + `\``;
   }).join(", ");
   return `CREATE VIEW IF NOT EXISTS ` + database + `.\`` + entityConfig.name + `\` AS

package/src/bindings/Hrtime.res

@@ -42,7 +42,7 @@ let toSecondsFloat = (elapsed: timeElapsed): float => {
   elapsed->toSeconds->(Utils.magic: seconds => float)
 }
 
-let toInt = float => float->Belt.Int.fromFloat
+let toInt = float => float->Int.fromFloat
 let intFromMillis = toInt
 let intFromNanos = toInt
 let intFromSeconds = toInt

package/src/bindings/Pino.res

@@ -160,13 +160,13 @@ module MultiStreamLogger = {
       stream: {write: v => formatter(v)->Console.log},
       level: userLogLevel,
     }
-    let maybeFileStream = logFile->Belt.Option.mapWithDefault([], dest => [
+    let maybeFileStream = logFile->Option.mapOr([], dest => [
       {
         level: defaultFileLogLevel,
         stream: destination({dest, sync: false, mkdir: true}),
       },
     ])
-    [stream]->Belt.Array.concat(maybeFileStream)
+    [stream]->Array.concat(maybeFileStream)
   }
 
   let make = (