@ndiinginc/router 4.11.2 → 4.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndiinginc/router",
-  "version": "4.11.2",
+  "version": "4.12.0",
   "description": "",
   "main": "./src/index.js",
   "scripts": {

package/src/app.js

@@ -1,5 +1,4 @@
 const http = require("http");
-const { EMPTY_PARAMS } = require("./util");
 const { Router } = require("./router");
 const { Request } = require("./request");
 const { Response } = require("./response");
@@ -67,7 +66,7 @@ class App extends Router {
      */
     async handle(req, res) {
         const { params, paramsLength, handlers, errorHandlers } = this.find(req.method, req.path);
-        req.params = paramsLength ? Object.assign(Object.create(null), params) : EMPTY_PARAMS;
+        req.params = paramsLength ? Object.assign(Object.create(null), params) : Object.create(null);
         let err;
         try {
             const handlerPromise = async () => {

package/src/util.js

@@ -1,6 +1,3 @@
-const EMPTY_PARAMS = Object.create(null);
-exports.EMPTY_PARAMS = EMPTY_PARAMS;
-
 /**
  * @param {String} raw
  * @returns {String}
@@ -14,39 +11,21 @@ function decodeParam(raw) {
 }
 exports.decodeParam = decodeParam;
 
-/**
- * @param {String} raw
- * @returns {String}
- */
-function decodeQuery(raw) {
-    const normalized = raw.replace(/\+/g, " ");
-    try {
-        return decodeURIComponent(normalized);
-    } catch (error) {
-        return normalized;
-    }
-}
-
 /**
  * @param {String} queryString
  * @returns {Object}
  */
 function parseQueryString(queryString) {
-    if (queryString === "") return Object.create(null);
-    const regex = /([^=&]*)=([^&]*)/g;
-    const result = Object.create(null);
-    let match;
-    while ((match = regex.exec(queryString))) {
-        const [, rawName, rawValue] = match;
-        const name = decodeQuery(rawName);
-        const value = decodeQuery(rawValue);
-        if (Object.hasOwn(result, name)) {
-            if (Array.isArray(result[name])) result[name].push(value);
-            else result[name] = [result[name], value];
-        } else result[name] = value;
+    const query = Object.create(null);
+    if (queryString) {
+        for (const [name, value] of new URLSearchParams(queryString)) {
+            if (Object.hasOwn(query, name)) {
+                if (Array.isArray(query[name])) query[name].push(value);
+                else query[name] = [query[name], value];
+            } else query[name] = value;
+        }
     }
-
-    return result;
+    return query;
 }
 exports.parseQueryString = parseQueryString;
 
@@ -55,11 +34,21 @@ exports.parseQueryString = parseQueryString;
  * @returns {{path: any;queryString: any;}}
  */
 function parseUrl(url) {
-    if (!(url.includes("?") || url.includes("#"))) {
-        return { path: url, queryString: "" };
+    let path = url;
+    let queryString = "";
+    let hash = "";
+    if (url.includes("?") || url.includes("#")) {
+        const hashIdx = url.indexOf("#");
+        if (hashIdx !== -1) {
+            hash = url.slice(hashIdx + 1);
+            path = url.slice(0, hashIdx);
+        }
+        const queryIdx = path.indexOf("?");
+        if (queryIdx !== -1) {
+            queryString = path.slice(queryIdx + 1);
+            path = path.slice(0, queryIdx);
+        }
     }
-    const regex = /^([^?#]*)(\?([^#]*))?(#.*)?$/;
-    const [, path = "/", , queryString = ""] = regex.exec(url);
-    return { path, queryString };
+    return { path, queryString, hash };
 }
 exports.parseUrl = parseUrl;