fix: revert changes to reduce size

Author: anonrig

lib/internals/querystring.js

@@ -1,28 +1,10 @@
-"use strict";
-
 // This file is taken from Node.js project.
 // Full implementation can be found from https://github.com/nodejs/node/blob/main/lib/internal/querystring.js
 
-// rome-ignore format: the array should not be formatted
-const hexTable = [
-  "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F",
-  "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F",
-  "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F",
-  "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F",
-  "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F",
-  "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F",
-  "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F",
-  "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F",
-  "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F",
-  "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F",
-  "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF",
-  "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF",
-  "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF",
-  "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF",
-  "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF",
-  "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF"
-];
-const utf16 = require("./utf16");
+const hexTable = Array.from(
+  { length: 256 },
+  (_, i) => "%" + ((i < 16 ? "0" : "") + i.toString(16)).toUpperCase(),
+);
 
 // These characters do not need escaping when generating query strings:
 // ! - . _ ~
@@ -48,63 +30,63 @@ const noEscape = new Int8Array([
  */
 function encodeString(str) {
   const len = str.length;
-  if (len === 0) return str;
+  if (len === 0) return "";
 
   let out = "";
   let lastPos = 0;
   let i = 0;
-  let c = 0;
 
-  while (i < len) {
-    c = str.charCodeAt(i);
+  outer: for (; i < len; i++) {
+    let c = str.charCodeAt(i);
 
     // ASCII
-    if (c < 0x80) {
-      if (noEscape[c] === 1) {
-        ++i;
-      } else {
+    while (c < 0x80) {
+      if (noEscape[c] !== 1) {
         if (lastPos < i) out += str.slice(lastPos, i);
-        lastPos = ++i;
+        lastPos = i + 1;
         out += hexTable[c];
       }
-      // Multi-byte characters ...
-    } else {
-      if (lastPos < i) {
-        out += str.slice(lastPos, i);
-      }
 
-      if (c < 0x800) {
-        lastPos = ++i;
-        out += utf16[c];
-      } else if (c < 0xd800) {
-        lastPos = ++i;
-        out += utf16[c];
-      } else if (c < 0xe000) {
-        // Surrogate pair
+      if (++i === len) break outer;
 
-        // This branch should never happen because all URLSearchParams entries
-        // should already be converted to USVString. But, included for
-        // completion's sake anyway.
-        if (++i === len) {
-          throw new Error("URI malformed");
-        }
+      c = str.charCodeAt(i);
+    }
 
-        c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));
-        lastPos = ++i;
-        out +=
-          hexTable[0xf0 | (c >> 18)] +
-          hexTable[0x80 | ((c >> 12) & 0x3f)] +
-          hexTable[0x80 | ((c >> 6) & 0x3f)] +
-          hexTable[0x80 | (c & 0x3f)];
-      } else {
-        if (lastPos < i) {
-          out += str.slice(lastPos, i);
-        }
-        // Multi-byte characters ...
-        lastPos = ++i;
-        out += utf16[c];
-      }
+    if (lastPos < i) out += str.slice(lastPos, i);
+
+    // Multi-byte characters ...
+    if (c < 0x800) {
+      lastPos = i + 1;
+      out += hexTable[0xc0 | (c >> 6)] + hexTable[0x80 | (c & 0x3f)];
+      continue;
     }
+    if (c < 0xd800 || c >= 0xe000) {
+      lastPos = i + 1;
+      out +=
+        hexTable[0xe0 | (c >> 12)] +
+        hexTable[0x80 | ((c >> 6) & 0x3f)] +
+        hexTable[0x80 | (c & 0x3f)];
+      continue;
+    }
+    // Surrogate pair
+    ++i;
+
+    // This branch should never happen because all URLSearchParams entries
+    // should already be converted to USVString. But, included for
+    // completion's sake anyway.
+    if (i >= len) {
+      throw new Error("URI malformed");
+    }
+
+    const c2 = str.charCodeAt(i) & 0x3ff;
+
+    lastPos = i + 1;
+    c = 0x10000 + (((c & 0x3ff) << 10) | c2);
+    out +=
+      hexTable[0xf0 | (c >> 18)] +
+      hexTable[0x80 | ((c >> 12) & 0x3f)] +
+      hexTable[0x80 | ((c >> 6) & 0x3f)] +
+      hexTable[0x80 | (c & 0x3f)];
   }
   if (lastPos === 0) return str;
   if (lastPos < len) return out + str.slice(lastPos);

lib/internals/utf16.js

@@ -27,10 +27,6 @@ test("should handle numbers", () => {
   );
 });
 
-test("should handle mixed ascii and non-ascii", () => {
-  assert.deepEqual(qs.stringify({ name: "Jöhn Doe" }), "name=J%C3%B6hn%20Doe");
-});
-
 test("should handle BigInt", () => {
   assert.deepEqual(
     qs.stringify({ age: BigInt(55), name: "John" }),