a2f3739 chore(TextEncoderStream): better polyfill tests (#6310)

QwikDev/qwik@47c95de
QwikDev · May 17, 2024 · 6b4df09 · 6b4df09
1 parent 271c362
commit 6b4df09
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 64 deletions.
diff --git a/middleware/bun/index.mjs b/middleware/bun/index.mjs
@@ -1,7 +1,8 @@
 // packages/qwik-city/middleware/bun/index.ts
 import {
   mergeHeadersCookies,
-  requestHandler
+  requestHandler,
+  _TextEncoderStream_polyfill
 } from "../request-handler/index.mjs";
 import { getNotFound } from "@qwik-city-not-found-paths";
 import { isStaticPath } from "@qwik-city-static-paths";
@@ -62,40 +63,10 @@ var MIME_TYPES = {
 
 // packages/qwik-city/middleware/bun/index.ts
 import { join, extname } from "node:path";
-var TextEncoderStream_polyfill = class {
-  constructor() {
-    this._encoder = new TextEncoder();
-    this._reader = null;
-    this.ready = Promise.resolve();
-    this.closed = false;
-    this.readable = new ReadableStream({
-      start: (controller) => {
-        this._reader = controller;
-      }
-    });
-    this.writable = new WritableStream({
-      write: async (chunk) => {
-        if (chunk != null && this._reader) {
-          const encoded = this._encoder.encode(chunk);
-          this._reader.enqueue(encoded);
-        }
-      },
-      close: () => {
-        var _a;
-        (_a = this._reader) == null ? void 0 : _a.close();
-        this.closed = true;
-      },
-      abort: (reason) => {
-        var _a;
-        (_a = this._reader) == null ? void 0 : _a.error(reason);
-        this.closed = true;
-      }
-    });
-  }
-};
 function createQwikCity(opts) {
   var _a;
-  globalThis.TextEncoderStream = TextEncoderStream || TextEncoderStream_polyfill;
+  globalThis.TextEncoderStream ||= class TextEncoderStream extends _TextEncoderStream_polyfill {
+  };
   const qwikSerializer = {
     _deserializeData,
     _serializeData,

diff --git a/middleware/cloudflare-pages/index.mjs b/middleware/cloudflare-pages/index.mjs
@@ -1,7 +1,8 @@
 // packages/qwik-city/middleware/cloudflare-pages/index.ts
 import {
   mergeHeadersCookies,
-  requestHandler
+  requestHandler,
+  _TextEncoderStream_polyfill
 } from "../request-handler/index.mjs";
 import { getNotFound } from "@qwik-city-not-found-paths";
 import { isStaticPath } from "@qwik-city-static-paths";
@@ -11,7 +12,8 @@ function createQwikCity(opts) {
   try {
     new globalThis.TextEncoderStream();
   } catch (e) {
-    globalThis.TextEncoderStream = TextEncoderStream;
+    globalThis.TextEncoderStream = class TextEncoderStream extends _TextEncoderStream_polyfill {
+    };
   }
   const qwikSerializer = {
     _deserializeData,
@@ -97,34 +99,6 @@ function createQwikCity(opts) {
   }
   return onCloudflarePagesFetch;
 }
-var resolved = Promise.resolve();
-var TextEncoderStream = class {
-  constructor() {
-    this._writer = null;
-    this.readable = {
-      pipeTo: (writableStream) => {
-        this._writer = writableStream.getWriter();
-      }
-    };
-    this.writable = {
-      getWriter: () => {
-        if (!this._writer) {
-          throw new Error("No writable stream");
-        }
-        const encoder = new TextEncoder();
-        return {
-          write: async (chunk) => {
-            if (chunk != null) {
-              await this._writer.write(encoder.encode(chunk));
-            }
-          },
-          close: () => this._writer.close(),
-          ready: resolved
-        };
-      }
-    };
-  }
-};
 export {
   createQwikCity
 };
diff --git a/middleware/request-handler/index.cjs b/middleware/request-handler/index.cjs
@@ -33,6 +33,7 @@ __export(request_handler_exports, {
   AbortMessage: () => AbortMessage,
   RedirectMessage: () => RedirectMessage,
   ServerError: () => ServerError,
+  _TextEncoderStream_polyfill: () => _TextEncoderStream_polyfill,
   getErrorHtml: () => getErrorHtml,
   mergeHeadersCookies: () => mergeHeadersCookies,
   requestHandler: () => requestHandler
@@ -1442,11 +1443,65 @@ async function loadRequestHandlers(qwikCityPlan, pathname, method, checkOrigin,
   }
   return null;
 }
+
+// packages/qwik-city/middleware/request-handler/polyfill.ts
+var _TextEncoderStream_polyfill = class {
+  #pendingHighSurrogate = null;
+  #handle = new TextEncoder();
+  #transform = new TransformStream({
+    transform: (chunk, controller) => {
+      chunk = String(chunk);
+      let finalChunk = "";
+      for (const item of chunk) {
+        const codeUnit = item.charCodeAt(0);
+        if (this.#pendingHighSurrogate !== null) {
+          const highSurrogate = this.#pendingHighSurrogate;
+          this.#pendingHighSurrogate = null;
+          if (codeUnit >= 56320 && codeUnit <= 57343) {
+            finalChunk += highSurrogate + item;
+            continue;
+          }
+          finalChunk += "\uFFFD";
+        }
+        if (codeUnit >= 55296 && codeUnit <= 56319) {
+          this.#pendingHighSurrogate = item;
+          continue;
+        }
+        if (codeUnit >= 56320 && codeUnit <= 57343) {
+          finalChunk += "\uFFFD";
+          continue;
+        }
+        finalChunk += item;
+      }
+      if (finalChunk) {
+        controller.enqueue(this.#handle.encode(finalChunk));
+      }
+    },
+    flush: (controller) => {
+      if (this.#pendingHighSurrogate !== null) {
+        controller.enqueue(new Uint8Array([239, 191, 189]));
+      }
+    }
+  });
+  get encoding() {
+    return this.#handle.encoding;
+  }
+  get readable() {
+    return this.#transform.readable;
+  }
+  get writable() {
+    return this.#transform.writable;
+  }
+  get [Symbol.toStringTag]() {
+    return "TextEncoderStream";
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbortMessage,
   RedirectMessage,
   ServerError,
+  _TextEncoderStream_polyfill,
   getErrorHtml,
   mergeHeadersCookies,
   requestHandler

diff --git a/middleware/request-handler/index.d.ts b/middleware/request-handler/index.d.ts
@@ -653,4 +653,18 @@ declare type StatusCodes = InformationalCode | SuccessCode | ClientErrorCode | S
  */
 declare type SuccessCode = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226;
 
+/**
+ * TextEncoderStream polyfill based on Node.js' implementation
+ * https://github.com/nodejs/node/blob/3f3226c8e363a5f06c1e6a37abd59b6b8c1923f1/lib/internal/webstreams/encoding.js#L38-L119
+ * (MIT License)
+ */
+/** @internal */
+export declare class _TextEncoderStream_polyfill {
+    #private;
+    get encoding(): string;
+    get readable(): ReadableStream<Uint8Array>;
+    get writable(): WritableStream<string>;
+    get [Symbol.toStringTag](): string;
+}
+
 export { }
diff --git a/middleware/request-handler/index.mjs b/middleware/request-handler/index.mjs
@@ -1401,10 +1401,64 @@ async function loadRequestHandlers(qwikCityPlan, pathname, method, checkOrigin,
   }
   return null;
 }
+
+// packages/qwik-city/middleware/request-handler/polyfill.ts
+var _TextEncoderStream_polyfill = class {
+  #pendingHighSurrogate = null;
+  #handle = new TextEncoder();
+  #transform = new TransformStream({
+    transform: (chunk, controller) => {
+      chunk = String(chunk);
+      let finalChunk = "";
+      for (const item of chunk) {
+        const codeUnit = item.charCodeAt(0);
+        if (this.#pendingHighSurrogate !== null) {
+          const highSurrogate = this.#pendingHighSurrogate;
+          this.#pendingHighSurrogate = null;
+          if (codeUnit >= 56320 && codeUnit <= 57343) {
+            finalChunk += highSurrogate + item;
+            continue;
+          }
+          finalChunk += "\uFFFD";
+        }
+        if (codeUnit >= 55296 && codeUnit <= 56319) {
+          this.#pendingHighSurrogate = item;
+          continue;
+        }
+        if (codeUnit >= 56320 && codeUnit <= 57343) {
+          finalChunk += "\uFFFD";
+          continue;
+        }
+        finalChunk += item;
+      }
+      if (finalChunk) {
+        controller.enqueue(this.#handle.encode(finalChunk));
+      }
+    },
+    flush: (controller) => {
+      if (this.#pendingHighSurrogate !== null) {
+        controller.enqueue(new Uint8Array([239, 191, 189]));
+      }
+    }
+  });
+  get encoding() {
+    return this.#handle.encoding;
+  }
+  get readable() {
+    return this.#transform.readable;
+  }
+  get writable() {
+    return this.#transform.writable;
+  }
+  get [Symbol.toStringTag]() {
+    return "TextEncoderStream";
+  }
+};
 export {
   AbortMessage,
   RedirectMessage,
   ServerError,
+  _TextEncoderStream_polyfill,
   getErrorHtml,
   mergeHeadersCookies,
   requestHandler

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/qwik-city",
   "description": "The meta-framework for Qwik.",
-  "version": "1.5.4-dev20240516053525",
+  "version": "1.5.4-dev20240517014936",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@mdx-js/mdx": "^3.0.1",