@joystick.js/node-canary 0.0.0-canary.35 → 0.0.0-canary.37

package/dist/app/accounts/getBrowserSafeUser.js

@@ -1,4 +1,5 @@
 import { isObject } from "../../validation/lib/typeValidators";
+import escapeKeyValuePair from "../../lib/escapeKeyValuePair.js";
 var getBrowserSafeUser_default = (user = null) => {
   if (!user || !isObject(user)) {
     return null;
@@ -16,7 +17,7 @@ var getBrowserSafeUser_default = (user = null) => {
       return fields;
     }
   }, {});
-  return browserSafeUser;
+  return escapeKeyValuePair(browserSafeUser);
 };
 export {
   getBrowserSafeUser_default as default

package/dist/app/getBrowserSafeRequest.js

@@ -1,9 +1,9 @@
 import getBrowserSafeUser from "./accounts/getBrowserSafeUser";
-import escapeHTML from "../lib/escapeHTML.js";
+import escapeKeyValuePair from "../lib/escapeKeyValuePair.js";
 var getBrowserSafeRequest_default = (req = {}) => {
   const browserSafeRequest = {};
-  browserSafeRequest.params = escapeHTML(req.params);
-  browserSafeRequest.query = escapeHTML(req.query);
+  browserSafeRequest.params = escapeKeyValuePair(req.params);
+  browserSafeRequest.query = escapeKeyValuePair(req.query);
   browserSafeRequest.context = {
     user: getBrowserSafeUser(req.context.user)
   };

package/dist/app/middleware/render.js

@@ -9,6 +9,7 @@ import replaceFileProtocol from "../../lib/replaceFileProtocol.js";
 import replaceBackslashesWithForwardSlashes from "../../lib/replaceBackslashesWithForwardSlashes.js";
 import getBuildPath from "../../lib/getBuildPath.js";
 import escapeHTML from "../../lib/escapeHTML.js";
+import escapeKeyValuePair from "../../lib/escapeKeyValuePair.js";
 const generateHash = (input = "") => {
   return crypto.createHash("sha256").update(input).digest("hex");
 };
@@ -66,8 +67,8 @@ const getCachedHTML = ({ cachePath, cacheFileName, currentDiff }) => {
 const getUrl = (request = {}) => {
   const [path = null] = request.url?.split("?");
   return {
-    params: escapeHTML(request.params),
-    query: escapeHTML(request.query),
+    params: escapeKeyValuePair(request.params),
+    query: escapeKeyValuePair(request.query),
     route: escapeHTML(request.route.path),
     path: escapeHTML(path)
   };

package/dist/app/middleware/sanitizeRequestParameters.js

@@ -1,19 +1,7 @@
-import escapeHTML from "../../lib/escapeHTML.js";
-const sanitizeParameterSet = (parameters = [], target = {}) => {
-  for (let i = 0; i < parameters?.length; i += 1) {
-    const [key, value] = parameters[i];
-    delete target[key];
-    target[escapeHTML(key)] = escapeHTML(value);
-  }
-};
+import escapeKeyValuePair from "../../lib/escapeKeyValuePair.js";
 var sanitizeRequestParameters_default = (req, res, next) => {
-  const parameters = Object.entries(req?.params);
-  const queryParameters = Object.entries(req?.query);
-  sanitizeParameterSet(parameters, req?.params);
-  sanitizeParameterSet(queryParameters, req?.query);
-  if (req?.route?.path) {
-    req.route.path = escapeHTML(req?.route?.path);
-  }
+  req.params = escapeKeyValuePair(req.params);
+  req.query = escapeKeyValuePair(req.query);
   next();
 };
 export {

package/dist/lib/escapeKeyValuePair.js

@@ -0,0 +1,13 @@
+import escapeHTML from "./escapeHTML.js";
+var escapeKeyValuePair_default = (target = {}) => {
+  const parameters = Object.entries(target || {});
+  for (let i = 0; i < parameters?.length; i += 1) {
+    const [key, value] = parameters[i];
+    delete target[key];
+    target[escapeHTML(key)] = escapeHTML(value);
+  }
+  return target;
+};
+export {
+  escapeKeyValuePair_default as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node-canary",
-  "version": "0.0.0-canary.35",
+  "version": "0.0.0-canary.37",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
   "main": "./dist/index.js",