@joystick.js/node-canary 0.0.0-canary.8 → 0.0.0-canary.80

package/_package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node",
-  "version": "1.0.0-beta.165",
+  "version": "1.0.0-beta.166",
   "developmentVersion": "1.0.0-beta.1419",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
@@ -39,6 +39,7 @@
     "node-html-parser": "^5.1.0",
     "nodemailer": "^6.7.0",
     "pg": "^8.7.3",
+    "pg-escape": "^0.2.0",
     "process": "^0.11.10",
     "query-string": "^7.0.1",
     "sanitize-html": "^2.7.3",

package/dist/app/accounts/createMetadataTableColumns.js

@@ -0,0 +1,12 @@
+import escape from "pg-escape";
+var createMetadataTableColumns_default = async (usersDatabase = "", sqlizedMetadata = {}) => {
+  if (usersDatabase === "postgresql") {
+    const columns = Object.keys(sqlizedMetadata);
+    for (let i = 0; i < columns?.length; i += 1) {
+      await process.databases.postgresql.query(escape(`ALTER TABLE users ADD COLUMN IF NOT EXISTS %I TEXT;`, columns[i]));
+    }
+  }
+};
+export {
+  createMetadataTableColumns_default as default
+};

package/dist/app/accounts/deleteUser.js

@@ -0,0 +1,7 @@
+import runUserQuery from "./runUserQuery.js";
+var deleteUser_default = (userId = "") => {
+  return runUserQuery("deleteUser", { userId });
+};
+export {
+  deleteUser_default as default
+};

package/dist/app/accounts/generateSession.js

@@ -1,9 +1,7 @@
 import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc.js";
 import generateId from "../../lib/generateId";
-if (process.env.NODE_ENV !== "test") {
-  const utc = await import("dayjs/plugin/utc");
-  dayjs.extend(utc.default);
-}
+dayjs.extend(utc);
 var generateSession_default = () => {
   return {
     token: generateId(64),

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/accounts/hasLoginTokenExpired.js

@@ -5,8 +5,7 @@ var hasLoginTokenExpired_default = async (res, token = null, tokenExpiresAt = nu
     unsetAuthenticationCookie(res);
     return true;
   }
-  const _dayjs = process.env.NODE_ENV === "test" ? (await import("../../tests/mocks/dayjs")).default : null;
-  const hasExpired = process.env.NODE_ENV === "test" ? _dayjs().isAfter(_dayjs(tokenExpiresAt)) : dayjs().isAfter(dayjs(tokenExpiresAt));
+  const hasExpired = dayjs().isAfter(dayjs(tokenExpiresAt));
   if (hasExpired) {
     unsetAuthenticationCookie(res);
     return true;

package/dist/app/accounts/index.js

@@ -1,6 +1,7 @@
 import _setAuthenticationCookie from "./setAuthenticationCookie.js";
 import _unsetAuthenticationCookie from "./unsetAuthenticationCookie.js";
 import defaultUserOutputFields from "./defaultUserOutputFields";
+import deleteUser from "./deleteUser.js";
 import getBrowserSafeUser from "./getBrowserSafeUser";
 import login from "./login";
 import recoverPassword from "./recoverPassword";
@@ -14,6 +15,7 @@ var accounts_default = {
   _setAuthenticationCookie,
   _unsetAuthenticationCookie,
   defaultUserOutputFields,
+  deleteUser,
   getBrowserSafeUser,
   login,
   recoverPassword,

package/dist/app/accounts/signup.js

@@ -6,6 +6,9 @@ import { isObject } from "../../validation/lib/typeValidators";
 import getOutput from "../getOutput";
 import typesMap from "../databases/typesMap";
 import getTargetDatabaseProvider from "../databases/getTargetDatabaseProvider.js";
+import stringToSnakeCase from "../databases/stringToSnakeCase.js";
+import createMetadataTableColumns from "./createMetadataTableColumns.js";
+import roles from "./roles/index.js";
 const addSessionToUser = (userId = null, session = null) => {
   try {
     return runUserQuery("addSession", { userId, session });
@@ -27,6 +30,16 @@ const insertUserInDatabase = async (user = {}) => {
     throw new Error(formatErrorString("signup.insertUserInDatabase", exception));
   }
 };
+const sqlizeMetadata = (metadata = {}) => {
+  try {
+    return Object.entries(metadata).reduce((sqlized = {}, [key, value]) => {
+      sqlized[stringToSnakeCase(key)] = value;
+      return sqlized;
+    }, {});
+  } catch (exception) {
+    throw new Error(`[actionName.sqlizeMetadata] ${exception.message}`);
+  }
+};
 const getUserToCreate = async (options = {}) => {
   try {
     const usersDatabase = getTargetDatabaseProvider("users");
@@ -40,12 +53,19 @@ const getUserToCreate = async (options = {}) => {
     if (options?.username) {
       user.username = options?.username;
     }
-    if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "sql" && options?.metadata?.language) {
-      user.language = options?.metadata?.language;
+    if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "sql") {
+      const sqlizedMetadata = sqlizeMetadata(options.metadata);
+      await createMetadataTableColumns(usersDatabase, sqlizedMetadata);
+      const { roles: [], ...restOfMetadata } = options?.metadata;
+      user = {
+        ...sqlizeMetadata(restOfMetadata),
+        ...user
+      };
     }
     if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "nosql") {
+      const { roles: [], ...restOfMetadata } = options?.metadata;
       user = {
-        ...options.metadata,
+        ...restOfMetadata || {},
         ...user
       };
     }
@@ -70,15 +90,25 @@ const signup = async (options, { resolve, reject }) => {
       return reject("Password is required.");
     }
     const existingUser = await getExistingUser(options.emailAddress, options.metadata?.username);
-    if (existingUser) {
+    if (existingUser && process.env.NODE_ENV !== "test") {
       throw new Error(`A user with the ${existingUser.existingUsername ? "username" : "email address"} ${existingUser.existingUsername || existingUser.existingEmailAddress} already exists.`);
     }
-    const userToCreate = await getUserToCreate(options);
-    const userId = await insertUserInDatabase(userToCreate);
+    let userToCreate;
+    let userId = existingUser?._id || existingUser?.user_id;
+    if (!existingUser) {
+      userToCreate = await getUserToCreate(options);
+      userId = await insertUserInDatabase(userToCreate);
+    }
     const user = await getUserByUserId(userId);
     const session = generateSession();
     if (user?._id || user?.user_id) {
-      await addSessionToUser(user._id || user?.user_id, session);
+      await addSessionToUser(user?._id || user?.user_id, session);
+    }
+    if (options?.metadata?.roles?.length > 0 && process.env.NODE_ENV === "test") {
+      for (let i = 0; i < options?.metadata?.roles?.length; i += 1) {
+        const role = options?.metadata?.roles[i];
+        roles.grant(user?._id || user?.user_id, role);
+      }
     }
     return resolve({
       ...session,

package/dist/app/databases/mongodb/createAccountsIndexes.js

@@ -0,0 +1,18 @@
+const createIndex = async (collectionName = "", index = {}) => {
+  return process.databases._users?.collection(collectionName).createIndex(index);
+};
+var createAccountsIndexes_default = async () => {
+  await createIndex("users", { _id: 1 });
+  await createIndex("users", { emailAddress: 1 });
+  await createIndex("users", { username: 1 });
+  await createIndex("users", { "sessions.token": 1 });
+  await createIndex("users", { "passwordResetTokens.token": 1 });
+  await createIndex("users", { "passwordResetTokens.token": 1, _id: 1 });
+  await createIndex("users", { roles: 1 });
+  await createIndex("users", { roles: 1, _id: 1 });
+  await createIndex("roles", { role: 1 });
+  await createIndex("roles", { role: 1, userId: 1 });
+};
+export {
+  createAccountsIndexes_default as default
+};

package/dist/app/databases/mongodb/index.js

@@ -17,7 +17,7 @@ var mongodb_default = async (settings = {}, databasePort = 2610) => {
     const connectionOptions = {
       useNewUrlParser: true,
       useUnifiedTopology: true,
-      ssl: !process.env.NODE_ENV?.includes("development"),
+      ssl: !["development", "test"].includes(process.env.NODE_ENV),
       ...settings?.options || {}
     };
     if (settings?.options?.ca) {

package/dist/app/databases/mongodb/queries/accounts.js

@@ -1,5 +1,7 @@
 import generateId from "../../../../lib/generateId";
 import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc.js";
+dayjs.extend(utc);
 var accounts_default = {
   existingUser: async (input = {}) => {
     let existingUserWithEmailAddress;
@@ -35,6 +37,11 @@ var accounts_default = {
     }
     return null;
   },
+  deleteUser: async (input = {}) => {
+    return process.databases._users?.collection("users").deleteOne({
+      _id: input?.userId
+    });
+  },
   deleteOldSessions: async (input = {}) => {
     const user = await process.databases._users?.collection("users").findOne({
       _id: input?.userId

package/dist/app/databases/postgresql/queries/accounts.js

@@ -43,6 +43,9 @@ var accounts_default = {
     }
     return null;
   },
+  deleteUser: async (input = {}) => {
+    await process.databases._users?.query(`DELETE FROM users WHERE user_id = $1`, [input?.userId]);
+  },
   deleteOldSessions: async (input = {}) => {
     await process.databases._users?.query(`DELETE FROM users_sessions WHERE user_id = $1 AND token_expires_at::date < NOW()`, [input?.userId]);
   },

package/dist/app/databases/stringToSnakeCase.js

@@ -0,0 +1,6 @@
+var stringToSnakeCase_default = (string = "") => {
+  return string?.split(/\.?(?=[A-Z])/).join("_").toLowerCase();
+};
+export {
+  stringToSnakeCase_default as default
+};

package/dist/app/getBrowserSafeRequest.js

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

package/dist/app/index.js

@@ -25,6 +25,7 @@ import runUploader from "./runUploader";
 import generateId from "../lib/generateId.js";
 import getOutput from "./getOutput.js";
 import defaultUserOutputFields from "./accounts/defaultUserOutputFields.js";
+import createMongoDBAccountsIndexes from "./databases/mongodb/createAccountsIndexes";
 import createPostgreSQLAccountsTables from "./databases/postgresql/createAccountsTables";
 import createPostgreSQLAccountsIndexes from "./databases/postgresql/createAccountsIndexes";
 import loadSettings from "../settings/load.js";
@@ -32,8 +33,15 @@ import Queue from "./queues/index.js";
 import readDirectory from "../lib/readDirectory.js";
 import getBuildPath from "../lib/getBuildPath.js";
 import generateMachineId from "../lib/generateMachineId.js";
+import importFile from "../lib/importFile.js";
 import emitWebsocketEvent from "../websockets/emitWebsocketEvent.js";
 import getTargetDatabaseConnection from "./databases/getTargetDatabaseConnection.js";
+import getAPIForDataFunctions from "../ssr/getAPIForDataFunctions.js";
+import getBrowserSafeRequest from "./getBrowserSafeRequest.js";
+import getDataFromComponent from "../ssr/getDataFromComponent.js";
+import getTranslations from "./middleware/getTranslations.js";
+import runUserQuery from "./accounts/runUserQuery.js";
+import wait from "../lib/wait.js";
 process.setMaxListeners(0);
 class App {
   constructor(options = {}) {
@@ -53,6 +61,7 @@ class App {
     this.initWebsockets(options?.websockets || {});
     this.initDevelopmentRoutes();
     this.initAccounts();
+    this.initTests();
     this.initDeploy();
     this.initAPI(options?.api);
     this.initRoutes(options?.routes);
@@ -85,6 +94,9 @@ class App {
     const hasQueuesDatabase = settings?.config?.databases?.some((database = {}) => {
       return !!database?.queues;
     });
+    const hasMongoDBUsersDatabase = settings?.config?.databases?.some((database = {}) => {
+      return database?.provider === "mongodb" && database?.users;
+    });
     const hasPostgreSQLUsersDatabase = settings?.config?.databases?.some((database = {}) => {
       return database?.provider === "postgresql" && database?.users;
     });
@@ -131,6 +143,9 @@ class App {
     if (hasQueuesDatabase) {
       process.databases._queues = getTargetDatabaseConnection("queues")?.connection;
     }
+    if (hasMongoDBUsersDatabase) {
+      await createMongoDBAccountsIndexes();
+    }
     if (hasPostgreSQLUsersDatabase) {
       await createPostgreSQLAccountsTables();
       await createPostgreSQLAccountsIndexes();
@@ -143,7 +158,9 @@ class App {
         process.BUILD_ERROR = JSON.parse(message);
       }
     });
-    console.log(`App running at: http://localhost:${express.port}`);
+    if (process.env.NODE_ENV !== "test") {
+      console.log(`App running at: http://localhost:${express.port}`);
+    }
   }
   setMachineId() {
     generateMachineId();
@@ -156,6 +173,63 @@ class App {
       fs.writeFileSync("./.joystick/PROCESS_ID", `${generateId(32)}`);
     }
   }
+  initTests() {
+    if (process.env.NODE_ENV === "test") {
+      this.express.app.get("/api/_test/bootstrap", async (req, res) => {
+        const buildPath = `${process.cwd()}/.joystick/build`;
+        const Component = req?.query?.pathToComponent ? await importFile(`${buildPath}/${req?.query?.pathToComponent}`) : null;
+        if (Component) {
+          const componentInstance = Component();
+          const apiForDataFunctions = await getAPIForDataFunctions(req, this?.options?.api);
+          const browserSafeRequest = getBrowserSafeRequest(req);
+          const data = await getDataFromComponent(componentInstance, apiForDataFunctions, browserSafeRequest);
+          const translations = await getTranslations({ build: buildPath, page: req?.query?.pathToComponent }, req);
+          return res.status(200).send({
+            data: {
+              [data?.componentId]: data?.data
+            },
+            translations,
+            req: browserSafeRequest
+          });
+        }
+        res.status(200).send({ data: {}, translations: {} });
+      });
+      this.express.app.post("/api/_test/accounts/signup", async (req, res) => {
+        const existingUser = await runUserQuery("user", { emailAddress: req?.body?.emailAddress });
+        if (existingUser) {
+          await runUserQuery("deleteUser", { userId: existingUser?._id || existingUser?.user_id });
+        }
+        const signup = await accounts.signup({
+          emailAddress: req?.body?.emailAddress,
+          password: req?.body?.password,
+          metadata: req?.body?.metadata,
+          output: req?.body?.output || defaultUserOutputFields
+        });
+        res.status(200).send(JSON.stringify({
+          ...signup?.user || {},
+          joystickToken: signup?.token,
+          joystickLoginTokenExpiresAt: signup?.tokenExpiresAt
+        }));
+      });
+      this.express.app.post("/api/_test/accounts/login", async (req, res) => {
+        const login = await accounts.login({
+          emailAddress: req?.body?.emailAddress,
+          username: req?.body?.username,
+          password: req?.body?.password,
+          output: req?.body?.output || defaultUserOutputFields
+        });
+        res.status(200).send(JSON.stringify({
+          ...login?.user || {},
+          joystickToken: login?.token,
+          joystickLoginTokenExpiresAt: login?.tokenExpiresAt
+        }));
+      });
+      this.express.app.delete("/api/_test/accounts", async (req, res) => {
+        await runUserQuery("deleteUser", { userId: req?.body?.userId });
+        res.status(200).send({ data: {} });
+      });
+    }
+  }
   initDeploy() {
     if (process.env.NODE_ENV === "production" && process.env.IS_PUSH_DEPLOYED) {
       this.express.app.get("/api/_push/pre-version", async (req, res) => {
@@ -401,7 +475,7 @@ class App {
     });
   }
   initDevelopmentRoutes() {
-    if (process.env.NODE_ENV === "development") {
+    if (["development", "test"].includes(process.env.NODE_ENV)) {
       this.express.app.get("/api/_joystick/sessions", async (req, res) => {
         const sessions = Array.from(this.sessions.entries())?.reduce((acc = {}, [key, value]) => {
           acc[key] = value;
@@ -431,11 +505,20 @@ class App {
           metadata: req?.body?.metadata,
           output: req?.body?.output || defaultUserOutputFields
         });
-        accounts._setAuthenticationCookie(res, {
-          token: signup?.token,
-          tokenExpiresAt: signup?.tokenExpiresAt
-        });
-        res.status(200).send(JSON.stringify(signup?.user || {}));
+        if (!process.env.NODE_ENV !== "test") {
+          accounts._setAuthenticationCookie(res, {
+            token: signup?.token,
+            tokenExpiresAt: signup?.tokenExpiresAt
+          });
+        }
+        const response = {
+          ...signup?.user || {}
+        };
+        if (process.env.NODE_ENV === "test") {
+          response.joystickToken = signup?.token;
+          response.joystickLoginTokenExpiresAt = signup?.tokenExpiresAt;
+        }
+        res.status(200).send(JSON.stringify(response));
       } catch (exception) {
         console.log(exception);
         return res.status(500).send(JSON.stringify({
@@ -451,11 +534,20 @@ class App {
           password: req?.body?.password,
           output: req?.body?.output || defaultUserOutputFields
         });
-        accounts._setAuthenticationCookie(res, {
-          token: login?.token,
-          tokenExpiresAt: login?.tokenExpiresAt
-        });
-        res.status(200).send(JSON.stringify(login?.user || {}));
+        if (!process.env.NODE_ENV !== "test") {
+          accounts._setAuthenticationCookie(res, {
+            token: login?.token,
+            tokenExpiresAt: login?.tokenExpiresAt
+          });
+        }
+        const response = {
+          ...login?.user || {}
+        };
+        if (process.env.NODE_ENV === "test") {
+          response.joystickToken = login?.token;
+          response.joystickLoginTokenExpiresAt = login?.tokenExpiresAt;
+        }
+        res.status(200).send(JSON.stringify(response));
       } catch (exception) {
         console.log(exception);
         return res.status(500).send(JSON.stringify({

package/dist/app/middleware/getTranslations.js

@@ -0,0 +1,64 @@
+import fs from "fs";
+import importFile from "../../lib/importFile.js";
+import { isObject } from "../../validation/lib/typeValidators.js";
+import settings from "../../settings/index.js";
+const getTranslationsFile = async (languageFilePath = "", paths = "") => {
+  const languageFile = await importFile(`${paths.build}/i18n/${languageFilePath}`);
+  const isValidLanguageFile = languageFile && isObject(languageFile);
+  if (isValidLanguageFile) {
+    const translationsForPage = languageFile[paths.page];
+    return translationsForPage ? translationsForPage : languageFile;
+  }
+  return {};
+};
+const getLanguagePreferenceRegexes = (userLanguage = "", browserLanguages = []) => {
+  let languagePreferences = [];
+  if (userLanguage) {
+    languagePreferences.push(userLanguage);
+  }
+  const filteredBrowserLanguages = browserLanguages?.filter((language) => {
+    return !language?.includes("*");
+  });
+  languagePreferences.push(...filteredBrowserLanguages);
+  languagePreferences.push(settings?.config?.i18n?.defaultLanguage);
+  return languagePreferences?.flatMap((language) => {
+    const variants = [language];
+    if (language?.length === 2) {
+      variants.push(`${language.substring(0, 2)}-`);
+    }
+    if (language?.length > 2) {
+      variants.push(`${language?.split("-")[0]}`);
+      variants.push(`${language?.split("-")[0]}-`);
+    }
+    return variants;
+  })?.map((languageString) => {
+    const lastCharacter = languageString[languageString.length - 1];
+    if (lastCharacter === "-") {
+      return new RegExp(`^${languageString}[A-Z]+.js`, "g");
+    }
+    return new RegExp(`^${languageString}.js`, "g");
+  });
+};
+const parseBrowserLanguages = (languages = "") => {
+  const rawLanguages = languages.split(",");
+  return rawLanguages?.map((rawLanguage) => rawLanguage.split(";")[0]);
+};
+var getTranslations_default = async (paths = {}, req = {}) => {
+  const languageFiles = fs.readdirSync(`${paths.build}/i18n`);
+  const browserLanguages = parseBrowserLanguages(req?.headers["accept-language"]);
+  const languagePreferences = getLanguagePreferenceRegexes(req?.context?.user?.language, browserLanguages);
+  let matchingFile = null;
+  for (let i = 0; i < languagePreferences.length; i += 1) {
+    const languageRegex = languagePreferences[i];
+    const match = languageFiles.find((languageFile) => !!languageFile.match(languageRegex));
+    if (match) {
+      matchingFile = match;
+      break;
+    }
+  }
+  const translationsFile = await getTranslationsFile(matchingFile, paths);
+  return translationsFile;
+};
+export {
+  getTranslations_default as default
+};

package/dist/app/middleware/index.js

@@ -3,6 +3,7 @@ import compression from "compression";
 import cookieParser from "cookie-parser";
 import favicon from "serve-favicon";
 import fs from "fs";
+import { __package } from "../../index.js";
 import insecure from "./insecure.js";
 import requestMethods from "./requestMethods.js";
 import bodyParser from "./bodyParser.js";
@@ -14,11 +15,10 @@ import runUserQuery from "../accounts/runUserQuery.js";
 import replaceBackslashesWithForwardSlashes from "../../lib/replaceBackslashesWithForwardSlashes.js";
 import replaceFileProtocol from "../../lib/replaceFileProtocol.js";
 import getBuildPath from "../../lib/getBuildPath.js";
-import sanitizeQueryParameters from "./sanitizeQueryParameters.js";
 import session from "./session.js";
 import csp from "./csp.js";
 const cwd = replaceFileProtocol(replaceBackslashesWithForwardSlashes(process.cwd()));
-const faviconPath = process.env.NODE_ENV === "test" ? `${cwd}/src/tests/mocks/app/public/favicon.ico` : "public/favicon.ico";
+const faviconPath = "public/favicon.ico";
 var middleware_default = ({
   app,
   port,
@@ -41,7 +41,6 @@ var middleware_default = ({
     }
     next();
   });
-  app.use(sanitizeQueryParameters);
   app.use(requestMethods);
   if (cspConfig) {
     app.use((req, res, next) => csp(req, res, next, cspConfig));
@@ -54,7 +53,7 @@ var middleware_default = ({
   });
   app.use("/_joystick/utils/process.js", (_req, res) => {
     res.set("Content-Type", "text/javascript");
-    const processPolyfill = fs.readFileSync(`${cwd}/node_modules/@joystick.js/node/dist/app/utils/process.js`, "utf-8");
+    const processPolyfill = fs.readFileSync(`${__package}/app/utils/process.js`, "utf-8");
     res.send(processPolyfill.replace("${NODE_ENV}", process.env.NODE_ENV));
   });
   app.use("/_joystick/index.client.js", express.static(`${buildPath}index.client.js`, {
@@ -65,7 +64,7 @@ var middleware_default = ({
   app.use("/_joystick/ui", express.static(`${buildPath}ui`, { eTag: false, maxAge: "0" }));
   app.use("/_joystick/hmr/client.js", (_req, res) => {
     res.set("Content-Type", "text/javascript");
-    const hmrClient = fs.readFileSync(`${cwd}/node_modules/@joystick.js/node/dist/app/middleware/hmr/client.js`, "utf-8");
+    const hmrClient = fs.readFileSync(`${__package}/app/middleware/hmr/client.js`, "utf-8");
     res.send(hmrClient.replace("${process.env.PORT}", parseInt(process.env.PORT, 10) + 1));
   });
   app.use(favicon(faviconPath));

package/dist/app/middleware/render.js

@@ -8,6 +8,10 @@ import generateErrorPage from "../../lib/generateErrorPage.js";
 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";
+import importFile from "../../lib/importFile.js";
+import getTranslations from "./getTranslations.js";
 const generateHash = (input = "") => {
   return crypto.createHash("sha256").update(input).digest("hex");
 };
@@ -65,71 +69,12 @@ const getCachedHTML = ({ cachePath, cacheFileName, currentDiff }) => {
 const getUrl = (request = {}) => {
   const [path = null] = request.url?.split("?");
   return {
-    params: request.params,
-    query: request.query,
-    route: request.route.path,
-    path
+    params: escapeKeyValuePair(request.params),
+    query: escapeKeyValuePair(request.query),
+    route: escapeHTML(request.route.path),
+    path: escapeHTML(path)
   };
 };
-const getFile = async (buildPath = "") => {
-  const file = await import(buildPath);
-  return file.default;
-};
-const getTranslationsFile = async (languageFilePath = "", paths = "") => {
-  const languageFile = await getFile(`${paths.build}/i18n/${languageFilePath}`);
-  const isValidLanguageFile = languageFile && isObject(languageFile);
-  if (isValidLanguageFile) {
-    const translationsForPage = languageFile[paths.page];
-    return translationsForPage ? translationsForPage : languageFile;
-  }
-  return {};
-};
-const getTranslations = async (paths = {}, languagePreferences = []) => {
-  const languageFiles = fs.readdirSync(`${paths.build}/i18n`);
-  let matchingFile = null;
-  for (let i = 0; i < languagePreferences.length; i += 1) {
-    const languageRegex = languagePreferences[i];
-    const match = languageFiles.find((languageFile) => !!languageFile.match(languageRegex));
-    if (match) {
-      matchingFile = match;
-      break;
-    }
-  }
-  const translationsFile = await getTranslationsFile(matchingFile, paths);
-  return translationsFile;
-};
-const getLanguagePreferenceRegexes = (userLanguage = "", browserLanguages = []) => {
-  let languagePreferences = [];
-  if (userLanguage) {
-    languagePreferences.push(userLanguage);
-  }
-  const filteredBrowserLanguages = browserLanguages?.filter((language) => {
-    return !language?.includes("*");
-  });
-  languagePreferences.push(...filteredBrowserLanguages);
-  languagePreferences.push(settings?.config?.i18n?.defaultLanguage);
-  return languagePreferences?.flatMap((language) => {
-    const variants = [language];
-    if (language?.length === 2) {
-      variants.push(`${language.substring(0, 2)}-`);
-    }
-    if (language?.length > 2) {
-      variants.push(`${language?.split("-")[0]}`);
-      variants.push(`${language?.split("-")[0]}-`);
-    }
-    return variants;
-  })?.map((languageString) => {
-    const lastCharacter = languageString[languageString.length - 1];
-    if (lastCharacter === "-") {
-      return new RegExp(`^${languageString}[A-Z]+.js`, "g");
-    }
-    return new RegExp(`^${languageString}.js`, "g");
-  });
-};
-const parseBrowserLanguages = (languages = "") => {
-  const rawLanguages = languages.split(",");
-  return rawLanguages?.map((rawLanguage) => rawLanguage.split(";")[0]);
-};
 var render_default = (req, res, next, appInstance = {}) => {
   res.render = async function(path = "", options = {}) {
     const urlFormattedForCache = req?.url?.split("/")?.filter((part) => !!part)?.join("_");
@@ -167,13 +112,11 @@ var render_default = (req, res, next, appInstance = {}) => {
         return res.send(cachedHTML);
       }
     }
-    const pageFile = await getFile(pagePath);
+    const pageFile = await importFile(pagePath);
     const Page = pageFile;
-    const layoutFile = layoutPath ? await getFile(layoutPath) : null;
+    const layoutFile = layoutPath ? await importFile(layoutPath) : null;
     const Layout = layoutFile;
-    const browserLanguages = parseBrowserLanguages(req?.headers["accept-language"]);
-    const languagePreferenceRegexes = getLanguagePreferenceRegexes(req?.context?.user?.language, browserLanguages);
-    const translations = await getTranslations({ build: buildPath, page: path }, languagePreferenceRegexes);
+    const translations = await getTranslations({ build: buildPath, page: path }, req);
     const url = getUrl(req);
     const props = { ...options?.props || {} };
     if (layoutPath && fs.existsSync(layoutPath)) {