@joystick.js/node-canary 0.0.0-canary.62 → 0.0.0-canary.63

package/dist/app/index.js

@@ -38,6 +38,7 @@ import getTargetDatabaseConnection from "./databases/getTargetDatabaseConnection
 import getAPIForDataFunctions from "../ssr/getAPIForDataFunctions.js";
 import getBrowserSafeRequest from "./getBrowserSafeRequest.js";
 import getDataFromComponent from "../ssr/getDataFromComponent.js";
+import getTranslations from "./middleware/getTranslations.js";
 process.setMaxListeners(0);
 class App {
   constructor(options = {}) {
@@ -166,17 +167,19 @@ class App {
   initTests() {
     if (process.env.NODE_ENV === "test") {
       this.express.app.get("/api/_test/bootstrap", async (req, res) => {
-        const Component = req?.query?.pathToComponent ? await importFile(`${process.cwd()}/.joystick/build/${req?.query?.pathToComponent}`) : null;
+        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: {}
+            translations
           });
         }
         res.status(200).send({ data: {}, translations: {} });

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/render.js

@@ -11,6 +11,7 @@ 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");
 };
@@ -74,61 +75,6 @@ const getUrl = (request = {}) => {
     path: escapeHTML(path)
   };
 };
-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 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("_");
@@ -170,9 +116,7 @@ var render_default = (req, res, next, appInstance = {}) => {
     const Page = pageFile;
     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)) {

package/package.json

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