envio 3.0.0-alpha.21 → 3.0.0-alpha.23

package/src/bindings/PromClient.res

@@ -18,10 +18,23 @@ type metricValue = {
 type metricInstance = {get: unit => promise<{"values": array<metricValue>}>}
 @send external getSingleMetric: (registry, string) => option<metricInstance> = "getSingleMetric"
 @send external resetMetrics: registry => unit = "resetMetrics"
+@send external clear: registry => unit = "clear"
+
+// Idempotent metric creation: if the metric already exists in the
+// registry (e.g., module loaded twice via different pnpm paths),
+// return the existing one instead of throwing.
+let getOrCreate = (name: string, create: unit => 'a): 'a => {
+  switch defaultRegister->getSingleMetric(name) {
+  | Some(existing) => existing->(Utils.magic: metricInstance => 'a)
+  | None => create()
+  }
+}
 
 module Counter = {
   type counter
-  @new @module("prom-client") external makeCounter: customMetric<'a> => counter = "Counter"
+  @new @module("prom-client") external makeCounterUnsafe: customMetric<'a> => counter = "Counter"
+  let makeCounter = (config: customMetric<'a>): counter =>
+    getOrCreate(config["name"], () => makeCounterUnsafe(config))
 
   @send external inc: counter => unit = "inc"
   @send external incMany: (counter, int) => unit = "inc"
@@ -31,7 +44,9 @@ module Counter = {
 
 module Gauge = {
   type gauge
-  @new @module("prom-client") external makeGauge: customMetric<'a> => gauge = "Gauge"
+  @new @module("prom-client") external makeGaugeUnsafe: customMetric<'a> => gauge = "Gauge"
+  let makeGauge = (config: customMetric<'a>): gauge =>
+    getOrCreate(config["name"], () => makeGaugeUnsafe(config))
 
   @send external inc: gauge => unit = "inc"
   @send external incMany: (gauge, int) => unit = "inc"

package/src/bindings/PromClient.res.mjs

@@ -1,15 +1,38 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as PromClient from "prom-client";
 
-var Counter = {};
+function getOrCreate(name, create) {
+  let existing = PromClient.register.getSingleMetric(name);
+  if (existing !== undefined) {
+    return existing;
+  } else {
+    return create();
+  }
+}
+
+function makeCounter(config) {
+  return getOrCreate(config.name, () => new PromClient.Counter(config));
+}
+
+let Counter = {
+  makeCounter: makeCounter
+};
+
+function makeGauge(config) {
+  return getOrCreate(config.name, () => new PromClient.Gauge(config));
+}
 
-var Gauge = {};
+let Gauge = {
+  makeGauge: makeGauge
+};
 
-var Summary = {};
+let Summary = {};
 
 export {
-  Counter ,
-  Gauge ,
-  Summary ,
+  getOrCreate,
+  Counter,
+  Gauge,
+  Summary,
 }
-/* No side effect */
+/* prom-client Not a pure module */

package/src/bindings/SDSL.res.mjs

@@ -1,9 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 
-var Queue = {};
+let Queue = {};
 
 export {
-  Queue ,
+  Queue,
 }
 /* No side effect */

package/src/bindings/Viem.res

@@ -14,7 +14,7 @@ type decodedEvent<'a> = {
 type hex = EvmTypes.Hex.t
 @module("viem") external toHex: 'a => hex = "toHex"
 @module("viem") external keccak256: hex => hex = "keccak256"
-@module("viem") external keccak256Bytes: bytes => hex = "keccak256"
+@module("viem") external keccak256Bytes: Uint8Array.t => hex = "keccak256"
 @module("viem") external pad: hex => hex = "pad"
 @module("viem")
 external encodePacked: (~types: array<string>, ~values: array<'a>) => hex = "encodePacked"
@@ -24,7 +24,7 @@ type sizeOptions = {size: int}
 @module("viem") external bigintToHex: (bigint, ~options: sizeOptions=?) => hex = "numberToHex"
 @module("viem") external stringToHex: (string, ~options: sizeOptions=?) => hex = "stringToHex"
 @module("viem") external boolToHex: (bool, ~options: sizeOptions=?) => hex = "boolToHex"
-@module("viem") external bytesToHex: (bytes, ~options: sizeOptions=?) => hex = "bytesToHex"
+@module("viem") external bytesToHex: (Uint8Array.t, ~options: sizeOptions=?) => hex = "bytesToHex"
 @module("viem") external concat: array<hex> => hex = "concat"
 
 exception ParseError(exn)
@@ -37,7 +37,7 @@ let parseLogOrThrow = (
   ~data,
 ) => {
   switch contractNameAbiMapping->Utils.Dict.dangerouslyGetNonOption(contractName) {
-  | None => raise(UnknownContractName({contractName: contractName}))
+  | None => throw(UnknownContractName({contractName: contractName}))
   | Some(abi) =>
     let viemLog: eventLog = {
       abi,
@@ -46,7 +46,7 @@ let parseLogOrThrow = (
     }
 
     try viemLog->decodeEventLogOrThrow catch {
-    | exn => raise(ParseError(exn))
+    | exn => throw(ParseError(exn))
     }
   }
 }

package/src/bindings/Viem.res.mjs

@@ -1,46 +1,44 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Viem from "viem";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
-import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
-var ParseError = /* @__PURE__ */Caml_exceptions.create("Viem.ParseError");
+let ParseError = /* @__PURE__ */Primitive_exceptions.create("Viem.ParseError");
 
-var UnknownContractName = /* @__PURE__ */Caml_exceptions.create("Viem.UnknownContractName");
+let UnknownContractName = /* @__PURE__ */Primitive_exceptions.create("Viem.UnknownContractName");
 
 function parseLogOrThrow(contractNameAbiMapping, contractName, topics, data) {
-  var abi = contractNameAbiMapping[contractName];
+  let abi = contractNameAbiMapping[contractName];
   if (abi !== undefined) {
-    var viemLog_abi = Caml_option.valFromOption(abi);
-    var viemLog = {
+    let viemLog_abi = Primitive_option.valFromOption(abi);
+    let viemLog = {
       abi: viemLog_abi,
       data: data,
       topics: topics
     };
     try {
       return Viem.decodeEventLog(viemLog);
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
       throw {
-            RE_EXN_ID: ParseError,
-            _1: exn,
-            Error: new Error()
-          };
+        RE_EXN_ID: ParseError,
+        _1: exn,
+        Error: new Error()
+      };
     }
   } else {
     throw {
-          RE_EXN_ID: UnknownContractName,
-          contractName: contractName,
-          Error: new Error()
-        };
+      RE_EXN_ID: UnknownContractName,
+      contractName: contractName,
+      Error: new Error()
+    };
   }
 }
 
 export {
-  ParseError ,
-  UnknownContractName ,
-  parseLogOrThrow ,
+  ParseError,
+  UnknownContractName,
+  parseLogOrThrow,
 }
 /* viem Not a pure module */

package/src/bindings/Vitest.res

@@ -24,7 +24,7 @@ type rec expectation<'a> = {
   toBeNaN: unit => unit,
   // String matchers
   toContain: string => unit,
-  toMatch: Js.Re.t => unit,
+  toMatch: RegExp.t => unit,
   toMatchString: string => unit,
   // Array matchers
   toContainItem: 'a => unit,

package/src/bindings/Vitest.res.mjs

@@ -1,9 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 
-var Async = {};
+let Async = {};
 
 export {
-  Async ,
+  Async,
 }
 /* No side effect */

package/src/bindings/WebSocket.res

@@ -17,7 +17,7 @@ type readyState =
 @get external readyState: t => readyState = "readyState"
 
 @set external onopen: (t, unit => unit) => unit = "onopen"
-@set external onerror: (t, Js.Exn.t => unit) => unit = "onerror"
+@set external onerror: (t, JsExn.t => unit) => unit = "onerror"
 @set external onclose: (t, unit => unit) => unit = "onclose"
 
 type messageEvent = {data: string}

package/src/db/EntityHistory.res

@@ -141,10 +141,16 @@ let backfillHistory = (sql, ~pgSchema, ~entityName, ~entityIndex, ~ids: array<st
     makeBackfillHistoryQuery(~entityName, ~entityIndex, ~pgSchema),
     [ids]->Obj.magic,
   )
-  ->Promise.ignoreValue
+  ->Utils.Promise.ignoreValue
 }
 
-let rollback = (sql, ~pgSchema, ~entityName, ~entityIndex, ~rollbackTargetCheckpointId: Internal.checkpointId) => {
+let rollback = (
+  sql,
+  ~pgSchema,
+  ~entityName,
+  ~entityIndex,
+  ~rollbackTargetCheckpointId: Internal.checkpointId,
+) => {
   sql
   ->Postgres.preparedUnsafe(
     `DELETE FROM "${pgSchema}"."${historyTableName(
@@ -153,5 +159,5 @@ let rollback = (sql, ~pgSchema, ~entityName, ~entityIndex, ~rollbackTargetCheckp
       )}" WHERE "${checkpointIdFieldName}" > $1;`,
     [rollbackTargetCheckpointId->BigInt.toString]->(Utils.magic: array<string> => unknown),
   )
-  ->Promise.ignoreValue
+  ->Utils.Promise.ignoreValue
 }

package/src/db/EntityHistory.res.mjs

@@ -1,83 +1,96 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Table from "./Table.res.mjs";
-import * as $$BigInt from "../bindings/BigInt.res.mjs";
-import * as Js_string from "rescript/lib/es6/js_string.js";
+import * as Js_string from "@rescript/runtime/lib/es6/Js_string.js";
+import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var variants = [
+let variants = [
   "SET",
   "DELETE"
 ];
 
-var name = "ENVIO_HISTORY_CHANGE";
+let name = "ENVIO_HISTORY_CHANGE";
 
-var schema = S$RescriptSchema.$$enum(variants);
+let schema = S$RescriptSchema.$$enum(variants);
 
-var config = {
+let config = {
   name: name,
   variants: variants,
   schema: schema
 };
 
-var RowAction = {
+let RowAction = {
   variants: variants,
   name: name,
   schema: schema,
   config: config
 };
 
-var changeFieldName = "envio_change";
+let changeFieldName = "envio_change";
 
-var checkpointIdFieldName = "envio_checkpoint_id";
+let checkpointIdFieldName = "envio_checkpoint_id";
 
-var changeFieldType = {
+let changeFieldType = {
   type: "Enum",
   config: config
 };
 
-var unsafeCheckpointIdSchema = S$RescriptSchema.transform(S$RescriptSchema.setName(S$RescriptSchema.string, "CheckpointId"), (function (s) {
-        return {
-                p: (function (string) {
-                    var v = $$BigInt.fromString(string);
-                    if (v !== undefined) {
-                      return v;
-                    } else {
-                      return s.fail("The string is not valid CheckpointId", undefined);
-                    }
-                  }),
-                s: (function (bigint) {
-                    return bigint.toString();
-                  })
-              };
-      }));
+let unsafeCheckpointIdSchema = S$RescriptSchema.transform(S$RescriptSchema.setName(S$RescriptSchema.string, "CheckpointId"), s => ({
+  p: string => {
+    let v = Stdlib_BigInt.fromString(string);
+    if (v !== undefined) {
+      return v;
+    } else {
+      return s.fail("The string is not valid CheckpointId", undefined);
+    }
+  },
+  s: bigint => bigint.toString()
+}));
 
 function makeSetUpdateSchema(entitySchema) {
-  return S$RescriptSchema.object(function (s) {
-              s.tag(changeFieldName, "SET");
-              return {
-                      type: "SET",
-                      entityId: s.f(Table.idFieldName, S$RescriptSchema.string),
-                      entity: s.flatten(entitySchema),
-                      checkpointId: s.f(checkpointIdFieldName, unsafeCheckpointIdSchema)
-                    };
-            });
+  return S$RescriptSchema.object(s => {
+    s.tag(changeFieldName, "SET");
+    return {
+      type: "SET",
+      entityId: s.f(Table.idFieldName, S$RescriptSchema.string),
+      entity: s.flatten(entitySchema),
+      checkpointId: s.f(checkpointIdFieldName, unsafeCheckpointIdSchema)
+    };
+  });
 }
 
-var historyTablePrefix = "envio_history_";
+let historyTablePrefix = "envio_history_";
 
 function historyTableName(entityName, entityIndex) {
-  var fullName = historyTablePrefix + entityName;
+  let fullName = historyTablePrefix + entityName;
   if (fullName.length <= 63) {
     return fullName;
   }
-  var entityIndexStr = String(entityIndex);
+  let entityIndexStr = String(entityIndex);
   return Js_string.slice(0, 63 - entityIndexStr.length | 0, fullName) + entityIndexStr;
 }
 
 function makePruneStaleEntityHistoryQuery(entityName, entityIndex, pgSchema) {
-  var historyTableRef = "\"" + pgSchema + "\".\"" + historyTableName(entityName, entityIndex) + "\"";
-  return "WITH anchors AS (\n  SELECT t.id, MAX(t." + checkpointIdFieldName + ") AS keep_checkpoint_id\n  FROM " + historyTableRef + " t WHERE t." + checkpointIdFieldName + " <= $1\n  GROUP BY t.id\n)\nDELETE FROM " + historyTableRef + " d\nUSING anchors a\nWHERE d.id = a.id\n  AND (\n    d." + checkpointIdFieldName + " < a.keep_checkpoint_id\n    OR (\n      d." + checkpointIdFieldName + " = a.keep_checkpoint_id AND\n      NOT EXISTS (\n        SELECT 1 FROM " + historyTableRef + " ps \n        WHERE ps.id = d.id AND ps." + checkpointIdFieldName + " > $1\n      ) \n    )\n  );";
+  let historyTableRef = `"` + pgSchema + `"."` + historyTableName(entityName, entityIndex) + `"`;
+  return `WITH anchors AS (
+  SELECT t.id, MAX(t.` + checkpointIdFieldName + `) AS keep_checkpoint_id
+  FROM ` + historyTableRef + ` t WHERE t.` + checkpointIdFieldName + ` <= $1
+  GROUP BY t.id
+)
+DELETE FROM ` + historyTableRef + ` d
+USING anchors a
+WHERE d.id = a.id
+  AND (
+    d.` + checkpointIdFieldName + ` < a.keep_checkpoint_id
+    OR (
+      d.` + checkpointIdFieldName + ` = a.keep_checkpoint_id AND
+      NOT EXISTS (
+        SELECT 1 FROM ` + historyTableRef + ` ps 
+        WHERE ps.id = d.id AND ps.` + checkpointIdFieldName + ` > $1
+      ) 
+    )
+  );`;
 }
 
 function pruneStaleEntityHistory(sql, entityName, entityIndex, pgSchema, safeCheckpointId) {
@@ -85,8 +98,20 @@ function pruneStaleEntityHistory(sql, entityName, entityIndex, pgSchema, safeChe
 }
 
 function makeBackfillHistoryQuery(pgSchema, entityName, entityIndex) {
-  var historyTableRef = "\"" + pgSchema + "\".\"" + historyTableName(entityName, entityIndex) + "\"";
-  return "WITH target_ids AS (\n  SELECT UNNEST($1::TEXT[]) AS id\n),\nmissing_history AS (\n  SELECT e.*\n  FROM \"" + pgSchema + "\".\"" + entityName + "\" e\n  JOIN target_ids t ON e.id = t.id\n  LEFT JOIN " + historyTableRef + " h ON h.id = e.id\n  WHERE h.id IS NULL\n)\nINSERT INTO " + historyTableRef + "\nSELECT *, 0 AS " + checkpointIdFieldName + ", '" + "SET" + "' as " + changeFieldName + "\nFROM missing_history;";
+  let historyTableRef = `"` + pgSchema + `"."` + historyTableName(entityName, entityIndex) + `"`;
+  return `WITH target_ids AS (
+  SELECT UNNEST($1::` + "TEXT" + `[]) AS id
+),
+missing_history AS (
+  SELECT e.*
+  FROM "` + pgSchema + `"."` + entityName + `" e
+  JOIN target_ids t ON e.id = t.id
+  LEFT JOIN ` + historyTableRef + ` h ON h.id = e.id
+  WHERE h.id IS NULL
+)
+INSERT INTO ` + historyTableRef + `
+SELECT *, 0 AS ` + checkpointIdFieldName + `, '` + "SET" + `' as ` + changeFieldName + `
+FROM missing_history;`;
 }
 
 function backfillHistory(sql, pgSchema, entityName, entityIndex, ids) {
@@ -94,28 +119,28 @@ function backfillHistory(sql, pgSchema, entityName, entityIndex, ids) {
 }
 
 function rollback(sql, pgSchema, entityName, entityIndex, rollbackTargetCheckpointId) {
-  return sql.unsafe("DELETE FROM \"" + pgSchema + "\".\"" + historyTableName(entityName, entityIndex) + "\" WHERE \"" + checkpointIdFieldName + "\" > $1;", [rollbackTargetCheckpointId.toString()], {prepare: true});
+  return sql.unsafe(`DELETE FROM "` + pgSchema + `"."` + historyTableName(entityName, entityIndex) + `" WHERE "` + checkpointIdFieldName + `" > $1;`, [rollbackTargetCheckpointId.toString()], {prepare: true});
 }
 
-var checkpointIdFieldType = "UInt64";
+let checkpointIdFieldType = "UInt64";
 
-var maxPgTableNameLength = 63;
+let maxPgTableNameLength = 63;
 
 export {
-  RowAction ,
-  changeFieldName ,
-  checkpointIdFieldName ,
-  checkpointIdFieldType ,
-  changeFieldType ,
-  unsafeCheckpointIdSchema ,
-  makeSetUpdateSchema ,
-  maxPgTableNameLength ,
-  historyTablePrefix ,
-  historyTableName ,
-  makePruneStaleEntityHistoryQuery ,
-  pruneStaleEntityHistory ,
-  makeBackfillHistoryQuery ,
-  backfillHistory ,
-  rollback ,
+  RowAction,
+  changeFieldName,
+  checkpointIdFieldName,
+  checkpointIdFieldType,
+  changeFieldType,
+  unsafeCheckpointIdSchema,
+  makeSetUpdateSchema,
+  maxPgTableNameLength,
+  historyTablePrefix,
+  historyTableName,
+  makePruneStaleEntityHistoryQuery,
+  pruneStaleEntityHistory,
+  makeBackfillHistoryQuery,
+  backfillHistory,
+  rollback,
 }
 /* schema Not a pure module */