refactor(node/util/types): make util/types a nodejs_compat module

unjs · Oct 11, 2024 · 4bc9c29 · 4bc9c29
1 parent b1eed1a
commit 4bc9c29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 114 deletions.
diff --git a/src/presets/cloudflare.ts b/src/presets/cloudflare.ts
@@ -19,6 +19,7 @@ const cloudflareNodeCompatModules = [
   "stream/promises",
   "stream/web",
   "string_decoder",
+  "util/types",
   "zlib",
 ];
 
@@ -33,7 +34,6 @@ const hybridNodeCompatModules = [
   "process",
   "timers",
   "util",
-  "util/types",
 ];
 
 const cloudflarePreset: Preset = {

diff --git a/src/runtime/node/util/$cloudflare.ts b/src/runtime/node/util/$cloudflare.ts
@@ -49,7 +49,6 @@ import {
   isUndefined,
   parseEnv,
   styleText,
-  types as unenvUtilTypes,
 } from "./index";
 
 const workerdUtil = process.getBuiltinModule("node:util");
@@ -81,12 +80,7 @@ export const {
   transferableAbortSignal,
 } = workerdUtil;
 
-// TODO(cloudflare): we should just implement this in workerd and drop this special case.
-export const types = {
-  ...workerdUtil.types,
-  isExternal: unenvUtilTypes.isExternal,
-  isAnyArrayBuffer: workerdUtil.types.isAnyArrayBuffer,
-} satisfies typeof nodeUtil.types;
+export const types = workerdUtil.types;
 
 export default {
   /**

diff --git a/src/runtime/node/util/types/$cloudflare.ts b/src/runtime/node/util/types/$cloudflare.ts
diff --git a/test/workerd/tests.mjs b/test/workerd/tests.mjs
@@ -58,3 +58,13 @@ export const buffer_implements = {
     assert.ok(new Buffer.Blob([]));
   },
 };
+
+// --- node:util
+
+export const util_implements = {
+  async test() {
+    const { types } = await import("unenv/runtime/node/util");
+    assert.strictEqual(types.isExternal("hello world"), false);
+    assert.strictEqual(types.isAnyArrayBuffer(new ArrayBuffer(0)), true);
+  },
+};