Fix CommonJS runtime compatibility

.github/workflows/ci.yml

@@ -117,7 +117,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 24
+          node-version: 20.11.0
           registry-url: 'https://registry.npmjs.org'
 
       - run: npm ci

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 1.3.4
+
+- Fix CommonJS DataLoader construction and provide CommonJS-safe connection,
+  base64, and stable-stringify helpers across the supported Node.js range.
+
 ## 1.3.3
 
 - Publish both ESM (`.mjs`) and CommonJS (`.js`) runtime artifacts so generated

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resgraph",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Build GraphQL servers in ReScript.",
   "main": "index.js",
   "scripts": {

src/res/DataLoader.mjs

@@ -1,14 +1,20 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import Dataloader from "dataloader";
 import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
-import * as StableStringifyMjs from "./stableStringify.mjs";
+import * as StableStringifyCjs from "./stableStringify.cjs";
+import * as DataLoaderCompatCjs from "./dataLoaderCompat.cjs";
 
-let Plain = {};
+function make(prim0, prim1) {
+  return new DataLoaderCompatCjs.DataLoader(prim0, prim1 !== undefined ? Primitive_option.valFromOption(prim1) : undefined);
+}
+
+let Plain = {
+  make: make
+};
 
 function stableStringifyValue(prim) {
-  return StableStringifyMjs.stableStringify(prim);
+  return StableStringifyCjs.stableStringify(prim);
 }
 
 function mapOptions(options) {
@@ -24,11 +30,11 @@ function mapOptions(options) {
 }
 
 function makeSingle(loadFn, options) {
-  return Stdlib_Lazy.make(() => new Dataloader(keys => Promise.all(keys.map(loadFn)), Primitive_option.toUndefined(mapOptions(options))));
+  return Stdlib_Lazy.make(() => new DataLoaderCompatCjs.DataLoader(keys => Promise.all(keys.map(loadFn)), Primitive_option.toUndefined(mapOptions(options))));
 }
 
 function makeBatched(loadFn, options) {
-  return Stdlib_Lazy.make(() => new Dataloader(loadFn, Primitive_option.toUndefined(mapOptions(options))));
+  return Stdlib_Lazy.make(() => new DataLoaderCompatCjs.DataLoader(loadFn, Primitive_option.toUndefined(mapOptions(options))));
 }
 
 function load(lazyLoader, key) {
@@ -78,4 +84,4 @@ export {
   primeWithPromise,
   name,
 }
-/* dataloader Not a pure module */
+/* ./stableStringify.cjs Not a pure module */

src/res/DataLoader.res

@@ -40,8 +40,8 @@ module Plain = {
 
   type batchFn<'key, 'value> = array<'key> => promise<array<'value>>
 
-  @new @module("dataloader")
-  external make: (batchFn<'key, 'value>, ~options: options=?) => t<'key, 'value> = "default"
+  @new @module("./dataLoaderCompat.cjs")
+  external make: (batchFn<'key, 'value>, ~options: options=?) => t<'key, 'value> = "DataLoader"
 
   /**
    * Loads a key, returning a `promise` for the value represented by that key.
@@ -108,7 +108,7 @@ type options = {
   name?: string,
 }
 
-@module("./stableStringify.mjs")
+@module("./stableStringify.cjs")
 external stableStringifyValue: 'any => 'any = "stableStringify"
 
 let mapOptions = options => {

src/res/DataLoader.resi

@@ -42,8 +42,8 @@ module Plain: {
   type batchFn<'key, 'value> = array<'key> => promise<array<'value>>
 
   /** Create a new data loader, from a batch load function. */
-  @new @module("dataloader")
-  external make: (batchFn<'key, 'value>, ~options: options=?) => t<'key, 'value> = "default"
+  @new @module("./dataLoaderCompat.cjs")
+  external make: (batchFn<'key, 'value>, ~options: options=?) => t<'key, 'value> = "DataLoader"
   /**
    * Loads a key, returning a `promise` for the value represented by that key.
    */

src/res/ResGraph__Connections.mjs

@@ -1,12 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as GraphqlRelayConnectionsMjs from "./graphqlRelayConnections.mjs";
+import * as GraphqlRelayConnectionsCjs from "./graphqlRelayConnections.cjs";
 
 function connectionFromArray(prim0, prim1) {
-  return GraphqlRelayConnectionsMjs.connectionFromArray(prim0, prim1);
+  return GraphqlRelayConnectionsCjs.connectionFromArray(prim0, prim1);
 }
 
 export {
   connectionFromArray,
 }
-/* ./graphqlRelayConnections.mjs Not a pure module */
+/* ./graphqlRelayConnections.cjs Not a pure module */

src/res/ResGraph__Connections.res

@@ -74,6 +74,6 @@ type connectionArgs = {
   ...backwardConnectionArgs,
 }
 
-@module("./graphqlRelayConnections.mjs")
+@module("./graphqlRelayConnections.cjs")
 external connectionFromArray: (array<'node>, ~args: connectionArgs) => connection<edge<'node>> =
   "connectionFromArray"

src/res/ResGraph__Utils.mjs

@@ -1,13 +1,13 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as GraphqlRelayConnectionsMjs from "./graphqlRelayConnections.mjs";
+import * as GraphqlRelayConnectionsCjs from "./graphqlRelayConnections.cjs";
 
 function encode(prim) {
-  return GraphqlRelayConnectionsMjs.encodeBase64(prim);
+  return GraphqlRelayConnectionsCjs.encodeBase64(prim);
 }
 
 function decode(prim) {
-  return GraphqlRelayConnectionsMjs.decodeBase64(prim);
+  return GraphqlRelayConnectionsCjs.decodeBase64(prim);
 }
 
 let Base64 = {
@@ -18,4 +18,4 @@ let Base64 = {
 export {
   Base64,
 }
-/* ./graphqlRelayConnections.mjs Not a pure module */
+/* ./graphqlRelayConnections.cjs Not a pure module */

src/res/ResGraph__Utils.res

@@ -1,7 +1,7 @@
 module Base64 = {
-  @module("./graphqlRelayConnections.mjs")
+  @module("./graphqlRelayConnections.cjs")
   external encode: string => string = "encodeBase64"
 
-  @module("./graphqlRelayConnections.mjs")
+  @module("./graphqlRelayConnections.cjs")
   external decode: string => string = "decodeBase64"
 }

src/res/dataLoaderCompat.cjs

@@ -0,0 +1,5 @@
+"use strict";
+
+const importedDataLoader = require("dataloader");
+
+exports.DataLoader = importedDataLoader.default ?? importedDataLoader;