Fix ESM wrapper interop with libsodium factory exports

Author: jedisct1

dist/modules-esm/libsodium-wrappers.mjs

@@ -0,0 +1,19 @@
+import { expect, test } from "bun:test";
+import { readFileSync } from "node:fs";
+
+const generatedEsmWrappers = [
+	"dist/modules-esm/libsodium-wrappers.mjs",
+	"dist/modules-sumo-esm/libsodium-wrappers.mjs",
+];
+
+for (const wrapperPath of generatedEsmWrappers) {
+	test(`${wrapperPath} supports both ESM export shapes`, () => {
+		const wrapper = readFileSync(wrapperPath, "utf8");
+
+		expect(wrapper).toContain('Unsupported libsodium ESM export shape');
+		expect(wrapper).toContain('.default');
+		expect(wrapper).toContain('.default.ready');
+		expect(wrapper).toContain('.ready.then(function');
+		expect(wrapper).toMatch(/return (n|moduleInstance)/);
+	});
+}

dist/modules-sumo-esm/libsodium-sumo.mjs

@@ -1,23 +1,55 @@
 "use strict";
 
-import createLibsodium from "/*{{libsodium}}*/";
+import libsodiumModuleOrFactory from "/*{{libsodium}}*/";
 
 const output_format = "uint8array";
 
 let libsodium;
 const exports = {};
 
+function _get_sodium_initializer(moduleOrFactory) {
+  if (typeof moduleOrFactory === "function") {
+    return moduleOrFactory;
+  }
+  if (moduleOrFactory != null && typeof moduleOrFactory.default === "function") {
+    return moduleOrFactory.default;
+  }
+  return null;
+}
+
+function _get_sodium_module(moduleOrFactory) {
+  if (moduleOrFactory != null && typeof moduleOrFactory.ready !== "undefined") {
+    return moduleOrFactory;
+  }
+  if (moduleOrFactory != null && moduleOrFactory.default != null && typeof moduleOrFactory.default.ready !== "undefined") {
+    return moduleOrFactory.default;
+  }
+  return null;
+}
+
 if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.getRandomValues !== "function") {
   throw new Error("globalThis.crypto.getRandomValues is not available. The ESM build of libsodium requires a secure random source (available in all browsers and Node.js 19+).");
 }
 
-const ready = createLibsodium({
-  getRandomValue: function() {
-    var buf = new Uint32Array(1);
-    globalThis.crypto.getRandomValues(buf);
-    return buf[0] >>> 0;
-  }
-}).then(function (libsodiumModule) {
+const getRandomValue = function() {
+  var buf = new Uint32Array(1);
+  globalThis.crypto.getRandomValues(buf);
+  return buf[0] >>> 0;
+};
+
+const initializer = _get_sodium_initializer(libsodiumModuleOrFactory);
+const moduleInstance = _get_sodium_module(libsodiumModuleOrFactory);
+
+const ready = (initializer != null
+  ? initializer({
+      getRandomValue: getRandomValue
+    })
+  : moduleInstance != null
+    ? moduleInstance.ready.then(function () {
+        return moduleInstance;
+      })
+    : Promise.reject(new Error("Unsupported libsodium ESM export shape"))
+).then(function (libsodiumModule) {
   libsodium = libsodiumModule;
   exports.libsodium = libsodium;