1 files changed, 110 insertions, 117 deletions
diff --git a/ext/web/14_compression.js b/ext/web/14_compression.js
index 338f8c803..680da757e 100644
--- a/ext/web/14_compression.js
+++ b/ext/web/14_compression.js
@@ -5,127 +5,120 @@
 /// <reference path="./internal.d.ts" />
 /// <reference path="./lib.deno_web.d.ts" />
 
-"use strict";
-
-((window) => {
-  const core = window.Deno.core;
-  const ops = core.ops;
-  const webidl = window.__bootstrap.webidl;
-  const { TransformStream } = window.__bootstrap.streams;
-
-  webidl.converters.CompressionFormat = webidl.createEnumConverter(
-    "CompressionFormat",
-    [
-      "deflate",
-      "deflate-raw",
-      "gzip",
-    ],
-  );
-
-  class CompressionStream {
-    #transform;
-
-    constructor(format) {
-      const prefix = "Failed to construct 'CompressionStream'";
-      webidl.requiredArguments(arguments.length, 1, { prefix });
-      format = webidl.converters.CompressionFormat(format, {
-        prefix,
-        context: "Argument 1",
-      });
-
-      const rid = ops.op_compression_new(format, false);
-
-      this.#transform = new TransformStream({
-        transform(chunk, controller) {
-          chunk = webidl.converters.BufferSource(chunk, {
-            prefix,
-            context: "chunk",
-          });
-          const output = ops.op_compression_write(
-            rid,
-            chunk,
-          );
-          maybeEnqueue(controller, output);
-        },
-        flush(controller) {
-          const output = ops.op_compression_finish(rid);
-          maybeEnqueue(controller, output);
-        },
-      });
-
-      this[webidl.brand] = webidl.brand;
-    }
-
-    get readable() {
-      webidl.assertBranded(this, CompressionStreamPrototype);
-      return this.#transform.readable;
-    }
-
-    get writable() {
-      webidl.assertBranded(this, CompressionStreamPrototype);
-      return this.#transform.writable;
-    }
+const core = globalThis.Deno.core;
+const ops = core.ops;
+import * as webidl from "internal:ext/webidl/00_webidl.js";
+import { TransformStream } from "internal:ext/web/06_streams.js";
+
+webidl.converters.CompressionFormat = webidl.createEnumConverter(
+  "CompressionFormat",
+  [
+    "deflate",
+    "deflate-raw",
+    "gzip",
+  ],
+);
+
+class CompressionStream {
+  #transform;
+
+  constructor(format) {
+    const prefix = "Failed to construct 'CompressionStream'";
+    webidl.requiredArguments(arguments.length, 1, { prefix });
+    format = webidl.converters.CompressionFormat(format, {
+      prefix,
+      context: "Argument 1",
+    });
+
+    const rid = ops.op_compression_new(format, false);
+
+    this.#transform = new TransformStream({
+      transform(chunk, controller) {
+        chunk = webidl.converters.BufferSource(chunk, {
+          prefix,
+          context: "chunk",
+        });
+        const output = ops.op_compression_write(
+          rid,
+          chunk,
+        );
+        maybeEnqueue(controller, output);
+      },
+      flush(controller) {
+        const output = ops.op_compression_finish(rid);
+        maybeEnqueue(controller, output);
+      },
+    });
+
+    this[webidl.brand] = webidl.brand;
   }
 
-  webidl.configurePrototype(CompressionStream);
-  const CompressionStreamPrototype = CompressionStream.prototype;
-
-  class DecompressionStream {
-    #transform;
-
-    constructor(format) {
-      const prefix = "Failed to construct 'DecompressionStream'";
-      webidl.requiredArguments(arguments.length, 1, { prefix });
-      format = webidl.converters.CompressionFormat(format, {
-        prefix,
-        context: "Argument 1",
-      });
-
-      const rid = ops.op_compression_new(format, true);
-
-      this.#transform = new TransformStream({
-        transform(chunk, controller) {
-          chunk = webidl.converters.BufferSource(chunk, {
-            prefix,
-            context: "chunk",
-          });
-          const output = ops.op_compression_write(
-            rid,
-            chunk,
-          );
-          maybeEnqueue(controller, output);
-        },
-        flush(controller) {
-          const output = ops.op_compression_finish(rid);
-          maybeEnqueue(controller, output);
-        },
-      });
-
-      this[webidl.brand] = webidl.brand;
-    }
-
-    get readable() {
-      webidl.assertBranded(this, DecompressionStreamPrototype);
-      return this.#transform.readable;
-    }
-
-    get writable() {
-      webidl.assertBranded(this, DecompressionStreamPrototype);
-      return this.#transform.writable;
-    }
+  get readable() {
+    webidl.assertBranded(this, CompressionStreamPrototype);
+    return this.#transform.readable;
   }
 
-  function maybeEnqueue(controller, output) {
-    if (output && output.byteLength > 0) {
-      controller.enqueue(output);
-    }
+  get writable() {
+    webidl.assertBranded(this, CompressionStreamPrototype);
+    return this.#transform.writable;
   }
+}
+
+webidl.configurePrototype(CompressionStream);
+const CompressionStreamPrototype = CompressionStream.prototype;
+
+class DecompressionStream {
+  #transform;
+
+  constructor(format) {
+    const prefix = "Failed to construct 'DecompressionStream'";
+    webidl.requiredArguments(arguments.length, 1, { prefix });
+    format = webidl.converters.CompressionFormat(format, {
+      prefix,
+      context: "Argument 1",
+    });
+
+    const rid = ops.op_compression_new(format, true);
+
+    this.#transform = new TransformStream({
+      transform(chunk, controller) {
+        chunk = webidl.converters.BufferSource(chunk, {
+          prefix,
+          context: "chunk",
+        });
+        const output = ops.op_compression_write(
+          rid,
+          chunk,
+        );
+        maybeEnqueue(controller, output);
+      },
+      flush(controller) {
+        const output = ops.op_compression_finish(rid);
+        maybeEnqueue(controller, output);
+      },
+    });
+
+    this[webidl.brand] = webidl.brand;
+  }
+
+  get readable() {
+    webidl.assertBranded(this, DecompressionStreamPrototype);
+    return this.#transform.readable;
+  }
+
+  get writable() {
+    webidl.assertBranded(this, DecompressionStreamPrototype);
+    return this.#transform.writable;
+  }
+}
+
+function maybeEnqueue(controller, output) {
+  if (output && output.byteLength > 0) {
+    controller.enqueue(output);
+  }
+}
 
-  webidl.configurePrototype(DecompressionStream);
-  const DecompressionStreamPrototype = DecompressionStream.prototype;
+webidl.configurePrototype(DecompressionStream);
+const DecompressionStreamPrototype = DecompressionStream.prototype;
 
-  window.__bootstrap.compression = {
-    CompressionStream,
-    DecompressionStream,
-  };
-})(globalThis);
+export { CompressionStream, DecompressionStream };