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

package/dist/app/sanitizeAPIResponse.js

@@ -1,10 +1,5 @@
 import util from "util";
-import { HTML_ENTITY_MAP } from "../lib/constants.js";
-const escapeHTML = (string = "") => {
-  return String(string).replace(/[&<>"'`=\/]/g, function(match) {
-    return HTML_ENTITY_MAP[match];
-  });
-};
+import escapeHTML from "../lib/escapeHTML.js";
 const sanitizeAPIResponse = (data = null) => {
   let sanitizedData = data;
   if (!util.isString(sanitizedData) && !util.isObject(sanitizedData) && !Array.isArray(sanitizedData)) {

package/dist/app/validateSession.js

@@ -3,6 +3,9 @@ var validateSession_default = (req = null, res = null, sessions = null) => {
   const sessionToken = req?.cookies?.joystickSession;
   const csrfToken = req?.headers["x-joystick-csrf"];
   const session = sessions?.get(sessionToken);
+  if (csrfToken === "joystick_test") {
+    return true;
+  }
   if (!session || session && session.csrf !== csrfToken) {
     res.status(403).send(JSON.stringify({
       errors: [formatAPIError(new Error("Unauthorized request."))]

package/dist/email/templates/reset-password.js

@@ -1,6 +1,5 @@
 import ui from "@joystick.js/ui";
 const ResetPassword = ui.component({
-  id: process.env.NODE_ENV === "test" ? "testComponent1234" : null,
   render: ({ props }) => {
     return `
       <p>A password reset was requested for this email address (${props.emailAddress}). If you requested this reset, click the link below to reset your password:</p>

package/dist/index.js

@@ -1,5 +1,7 @@
-import sanitizeHTML from "sanitize-html";
 import fs from "fs";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+import sanitizeHTML from "sanitize-html";
 import _accounts from "./app/accounts";
 import _action from "./action/index.js";
 import _websockets from "./websockets";
@@ -27,16 +29,18 @@ const sanitize = {
     allowedTags: sanitizeHTML.defaults.allowedTags
   }
 };
+const currentFilePath = fileURLToPath(import.meta.url);
+const __package = dirname(currentFilePath);
 const __filename = nodeUrlPolyfills.__filename;
 const __dirname = nodeUrlPolyfills.__dirname;
 const id = generateId;
 const origin = getOrigin();
 const settings = loadSettings();
-console.log("HERE", fs.readFileSync(__dirname("dist/app/utils/process.js")?.replace("file://", ""), "utf-8"));
 global.joystick = {
   id: generateId,
   emitters: {},
   settings,
+  __package,
   __dirname,
   __filename
 };
@@ -58,6 +62,7 @@ var src_default = {
 export {
   __dirname,
   __filename,
+  __package,
   accounts,
   action,
   src_default as default,

package/dist/lib/escapeHTML.js

@@ -0,0 +1,9 @@
+import { HTML_ENTITY_MAP } from "./constants.js";
+var escapeHTML_default = (string = "") => {
+  return String(string).replace(/[&<>"'`=]/g, function(match) {
+    return HTML_ENTITY_MAP[match];
+  });
+};
+export {
+  escapeHTML_default as default
+};

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/dist/lib/getBuildPath.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 var getBuildPath_default = () => {
-  if (process.env.NODE_ENV === "development" || fs.existsSync(".joystick/build")) {
+  if (["development", "test"].includes(process.env.NODE_ENV) || fs.existsSync(".joystick/build")) {
     return ".joystick/build/";
   }
   return "";

package/dist/lib/getSSLCertificates.js

@@ -6,7 +6,7 @@ var getSSLCertificates_default = (ssl = null) => {
   const keyPath = process.env.IS_PUSH_DEPLOYED ? pushKeyPath : ssl?.key || null;
   const certExists = fs.existsSync(certPath);
   const keyExists = fs.existsSync(keyPath);
-  if (process.env.NODE_ENV === "development" || !certExists || !keyExists) {
+  if (["development", "test"].includes(process.env.NODE_ENV) || !certExists || !keyExists) {
     return null;
   }
   return {

package/dist/lib/importFile.js

@@ -0,0 +1,7 @@
+var importFile_default = async (buildPath = "") => {
+  const file = await import(buildPath);
+  return file?.default;
+};
+export {
+  importFile_default as default
+};

package/dist/lib/log.js

@@ -1,9 +1,6 @@
 import chalk from "chalk";
 import rainbowRoad from "./rainbowRoad.js";
 var log_default = (message = "", options = {}) => {
-  if (process.env.NODE_ENV === "test") {
-    return;
-  }
   const colors = {
     info: "blue",
     success: "green",

package/dist/lib/nodeUrlPolyfills.js

@@ -1,19 +1,12 @@
-import { URL } from "url";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
 var nodeUrlPolyfills_default = {
-  __filename: (url = null) => {
-    if (!url) {
-      return "";
-    }
-    const path = new URL(".", url)?.replace("file://", "");
-    return path?.pathname;
+  __filename: (url = "") => {
+    return fileURLToPath(url);
   },
-  __dirname: (url = null) => {
-    if (!url) {
-      return "";
-    }
-    console.log({ url });
-    const path = new URL("./", url)?.replace("file://", "");
-    return path?.pathname || "";
+  __dirname: (url = "") => {
+    const currentFilePath = fileURLToPath(url);
+    return dirname(currentFilePath);
   }
 };
 export {

package/dist/lib/wait.js

@@ -0,0 +1,8 @@
+var wait_default = (seconds = 0) => {
+  return new Promise((resolve) => {
+    setTimeout(() => resolve(), seconds * 1e3);
+  });
+};
+export {
+  wait_default as default
+};

package/dist/ssr/getAPIForDataFunctions.js

@@ -0,0 +1,33 @@
+import get from "../api/get";
+import set from "../api/set";
+var getAPIForDataFunctions_default = (req = {}, api = {}) => {
+  try {
+    return {
+      get: (getterName = "", getterOptions = {}) => {
+        return get({
+          getterName,
+          getterOptions: api?.getters[getterName] || {},
+          input: getterOptions?.input,
+          output: getterOptions?.output,
+          context: req?.context,
+          APIOptions: api?.options
+        });
+      },
+      set: (setterName = "", setterOptions = {}) => {
+        return set({
+          setterName,
+          setterOptions: api?.setters[setterName] || {},
+          input: setterOptions?.input,
+          output: setterOptions?.output,
+          context: req?.context,
+          APIOptions: api?.options
+        });
+      }
+    };
+  } catch (exception) {
+    throw new Error(`[ssr.getAPIForDataFunctions] ${exception.message}`);
+  }
+};
+export {
+  getAPIForDataFunctions_default as default
+};

package/dist/ssr/getDataFromComponent.js

@@ -0,0 +1,14 @@
+var getDataFromComponent_default = async (componentInstance = {}, api = {}, browserSafeRequest = {}) => {
+  try {
+    const data = await componentInstance.handleFetchData(api, browserSafeRequest, {}, componentInstance);
+    return {
+      componentId: componentInstance?.id,
+      data
+    };
+  } catch (exception) {
+    throw new Error(`[ssr.getDataFromComponent] ${exception.message}`);
+  }
+};
+export {
+  getDataFromComponent_default as default
+};

package/dist/ssr/index.js

@@ -1,4 +1,5 @@
 import fs from "fs";
+import { __package } from "../index.js";
 import get from "../api/get";
 import set from "../api/set";
 import getBrowserSafeRequest from "../app/getBrowserSafeRequest";
@@ -7,6 +8,8 @@ import getCSSFromTree from "./getCSSFromTree";
 import replaceWhenTags from "./replaceWhenTags";
 import setHeadTagsInHTML from "./setHeadTagsInHTML";
 import { parseHTML } from "linkedom";
+import getDataFromComponent from "./getDataFromComponent.js";
+import getAPIForDataFunctions from "./getAPIForDataFunctions.js";
 const injectCSSIntoHTML = (html, baseCSS = "", css = "") => {
   try {
     return html.replace("${css}", css).replace("${globalCSS}", `<style>${baseCSS || ""}</style>`).replace("${componentCSS}", css);
@@ -184,7 +187,7 @@ const getBaseCSS = (baseHTMLName = "") => {
   try {
     const customBaseCSSPathForEmail = baseHTMLName ? `${process.cwd()}/email/base_${baseHTMLName}.css` : null;
     const customDefaultBaseCSSPathForEmail = `${process.cwd()}/email/base.css`;
-    const defaultBaseCSSPathForEmail = process.env.NODE_ENV === "test" ? `${process.cwd()}/src/email/templates/base.css` : `${process.cwd()}/node_modules/@joystick.js/node/dist/email/templates/base.css`;
+    const defaultBaseCSSPathForEmail = process.env.NODE_ENV === "test" ? `${process.cwd()}/src/email/templates/base.css` : `${__package}/email/templates/base.css`;
     let baseCSSPathToFetch = defaultBaseCSSPathForEmail;
     if (fs.existsSync(customDefaultBaseCSSPathForEmail)) {
       baseCSSPathToFetch = customDefaultBaseCSSPathForEmail;
@@ -242,7 +245,7 @@ const getBaseHTML = (isEmailRender = false, baseEmailHTMLName = "") => {
     if (isEmailRender) {
       const customBaseHTMLPathForEmail = baseEmailHTMLName ? `${process.cwd()}/email/base_${baseEmailHTMLName}.html` : null;
       const customDefaultBaseHTMLPathForEmail = `${process.cwd()}/email/base.html`;
-      const defaultBaseHTMLPathForEmail = process.env.NODE_ENV === "test" ? `${process.cwd()}/src/email/templates/base.html` : `${process.cwd()}/node_modules/@joystick.js/node/dist/email/templates/base.html`;
+      const defaultBaseHTMLPathForEmail = process.env.NODE_ENV === "test" ? `${process.cwd()}/src/email/templates/base.html` : `${__package}/email/templates/base.html`;
       baseHTMLPathToFetch = defaultBaseHTMLPathForEmail;
       if (fs.existsSync(customDefaultBaseHTMLPathForEmail)) {
         baseHTMLPathToFetch = customDefaultBaseHTMLPathForEmail;
@@ -289,17 +292,6 @@ const buildTreeForComponent = (componentInstance = {}, ssrTree = {}, translation
     throw new Error(`[ssr.buildTreeForComponent] ${exception.message}`);
   }
 };
-const getDataFromComponent = async (componentInstance = {}, api = {}, browserSafeRequest = {}) => {
-  try {
-    const data = await componentInstance.handleFetchData(api, browserSafeRequest, {}, componentInstance);
-    return {
-      componentId: componentInstance?.id,
-      data
-    };
-  } catch (exception) {
-    throw new Error(`[ssr.getDataFromComponent] ${exception.message}`);
-  }
-};
 const getTreeForSSR = (componentInstance = {}) => {
   try {
     return {
@@ -320,34 +312,6 @@ const getComponentInstance = (Component, options = {}) => {
     throw new Error(`[ssr.getComponentInstance] ${exception.message}`);
   }
 };
-const getAPIForDataFunctions = (req = {}, api = {}) => {
-  try {
-    return {
-      get: (getterName = "", getterOptions = {}) => {
-        return get({
-          getterName,
-          getterOptions: api?.getters[getterName] || {},
-          input: getterOptions?.input,
-          output: getterOptions?.output,
-          context: req?.context,
-          APIOptions: api?.options
-        });
-      },
-      set: (setterName = "", setterOptions = {}) => {
-        return set({
-          setterName,
-          setterOptions: api?.setters[setterName] || {},
-          input: setterOptions?.input,
-          output: setterOptions?.output,
-          context: req?.context,
-          APIOptions: api?.options
-        });
-      }
-    };
-  } catch (exception) {
-    throw new Error(`[ssr.getAPIForDataFunctions] ${exception.message}`);
-  }
-};
 const validateOptions = (options) => {
   try {
     if (!options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node-canary",
-  "version": "0.0.0-canary.8",
+  "version": "0.0.0-canary.80",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
   "main": "./dist/index.js",
@@ -38,6 +38,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/roles/index.test.js

@@ -1,123 +0,0 @@
-import { jest } from "@jest/globals";
-import { killPortProcess } from "kill-port-process";
-import setAppSettingsForTest from "../../../tests/lib/setAppSettingsForTest";
-import startTestDatabase from "../../../tests/lib/databases/start";
-import stopTestDatabase from "../../../tests/lib/databases/stop";
-import { beforeEach, expect, test } from "@jest/globals";
-import roles from "./index";
-import accounts from "../index";
-jest.mock("../../../../node_modules/dayjs", () => {
-  const _dayjs = jest.requireActual("../../../../node_modules/dayjs");
-  const _utc = jest.requireActual("../../../../node_modules/dayjs/plugin/utc");
-  _dayjs.extend(_utc);
-  return () => _dayjs("2022-01-01T00:00:00.000Z");
-});
-setAppSettingsForTest({
-  "config": {
-    "databases": [
-      {
-        "provider": "mongodb",
-        "users": true,
-        "options": {}
-      }
-    ],
-    "i18n": {
-      "defaultLanguage": "en-US"
-    },
-    "middleware": {},
-    "email": {
-      "from": "app@test.com",
-      "smtp": {
-        "host": "fake.email.com",
-        "port": 587,
-        "username": "test",
-        "password": "password"
-      }
-    }
-  },
-  "global": {},
-  "public": {},
-  "private": {}
-});
-global.joystick = {
-  settings: {
-    config: {
-      databases: [{
-        "provider": "mongodb",
-        "users": true,
-        "options": {}
-      }]
-    }
-  }
-};
-const app = (await import("../../index")).default;
-let instance;
-describe("app/accounts/roles/index.js", () => {
-  beforeAll(async () => {
-    process.env.PORT = 3600;
-  });
-  beforeEach(async () => {
-    instance = await app({});
-  });
-  afterEach(async () => {
-    if (instance?.server?.close && typeof instance.server.close === "function") {
-      instance.server.close();
-    }
-    await killPortProcess(process.env.PORT);
-  });
-  afterAll(async () => {
-  });
-  test("roles.add adds role to roles collection in database", async () => {
-    await roles.add("admin");
-    const roleExists = await process.databases.mongodb.collection("roles").findOne({ role: "admin" });
-    expect(!!roleExists).toBe(true);
-  });
-  test("roles.remove removes role from roles collection in database", async () => {
-    await roles.add("admin");
-    await roles.remove("admin");
-    const roleExists = await process.databases.mongodb.collection("roles").findOne({ role: "admin" });
-    expect(!!roleExists).toBe(false);
-  });
-  test("roles.list returns a list of roles in the roles collection in database", async () => {
-    await roles.add("admin");
-    await roles.add("manager");
-    await roles.add("employee");
-    const rolesInDatabase = await roles.list();
-    await roles.remove("admin");
-    await roles.remove("manager");
-    await roles.remove("employee");
-    expect(rolesInDatabase).toEqual(["admin", "manager", "employee"]);
-  });
-  test("roles.grant adds role to user in users collection in database", async () => {
-    await process.databases.mongodb.collection("users").deleteOne({ emailAddress: "test@test.com" });
-    const user = await accounts.signup({ emailAddress: "test@test.com", password: "password" });
-    await roles.grant(user?.userId, "admin");
-    await roles.grant(user?.userId, "rolethatdoesntexist");
-    const userAfterGrant = await process.databases.mongodb.collection("users").findOne({ _id: user?.userId });
-    const rolesCreated = await process.databases.mongodb.collection("roles").find().toArray();
-    expect(userAfterGrant?.roles?.includes("admin")).toBe(true);
-    expect(rolesCreated?.length).toBe(2);
-  });
-  test("roles.revoke removes role from user in users collection in database", async () => {
-    await process.databases.mongodb.collection("users").deleteOne({ emailAddress: "test@test.com" });
-    const user = await accounts.signup({ emailAddress: "test@test.com", password: "password" });
-    await roles.grant(user?.userId, "admin");
-    await roles.revoke(user?.userId, "admin");
-    const userAfterGrant = await process.databases.mongodb.collection("users").findOne({ _id: user?.userId });
-    expect(userAfterGrant?.roles?.includes("admin")).toBe(false);
-  });
-  test("roles.userHasRole returns true if user has role", async () => {
-    await process.databases.mongodb.collection("users").deleteOne({ emailAddress: "test@test.com" });
-    const user = await accounts.signup({ emailAddress: "test@test.com", password: "password" });
-    await roles.grant(user?.userId, "admin");
-    const userHasRole = await roles.userHasRole(user?.userId, "admin");
-    expect(userHasRole).toBe(true);
-  });
-  test("roles.userHasRole returns false if user does not have role", async () => {
-    await process.databases.mongodb.collection("users").deleteOne({ emailAddress: "test@test.com" });
-    const user = await accounts.signup({ emailAddress: "test@test.com", password: "password" });
-    await roles.grant(user?.userId, "admin");
-    const userHasRole = await roles.userHasRole(user?.userId, "manager");
-    expect(userHasRole).toBe(false);
-  });
-});