@joystick.js/node-canary 0.0.0-canary.450 → 0.0.0-canary.451

package/dist/app/api/test/bootstrap.js

@@ -1 +1 @@
-import p from"../../../lib/dynamic_import.js";import c from"../get_api_for_data_functions.js";import m from"../../../lib/get_browser_safe_request.js";import d from"../../../lib/get_translations.js";import f from"../../settings/load.js";const u=async(t={},a={},_={})=>{const n=`${process.cwd()}/.joystick/build/`,s=t?.query?.path_to_component?await p(`${n}/${t?.query?.path_to_component}?v=${new Date().getTime()}`):null;if(s){const o=s(),i=c(t,_?.options?.api),e=m(t),r=await o.fetch_data(i,e,{},o);return a.status(200).send({data:{[o?.id]:r},req:e,settings:f(),translations:await d({joystick_build_path:n,render_component_path:t?.query?.path_to_component,req:t})})}a.status(200).send({data:{},translations:{}})};var b=u;export{b as default};
+import p from"../../../lib/dynamic_import.js";import c from"../get_api_for_data_functions.js";import m from"../../../lib/get_browser_safe_request.js";import d from"../../../lib/get_platform_safe_path.js";import f from"../../../lib/get_translations.js";import u from"../../settings/load.js";const l=async(t={},a={},_={})=>{const n=`${process.cwd()}/.joystick/build/`,s=t?.query?.path_to_component?await p(d(`${n}/${t?.query?.path_to_component}?v=${new Date().getTime()}`)):null;if(s){const o=s(),r=c(t,_?.options?.api),e=m(t),i=await o.fetch_data(r,e,{},o);return a.status(200).send({data:{[o?.id]:i},req:e,settings:u(),translations:await f({joystick_build_path:n,render_component_path:t?.query?.path_to_component,req:t})})}a.status(200).send({data:{},translations:{}})};var j=l;export{j as default};

package/dist/app/ssr/index.js

@@ -1,4 +1,4 @@
-import u from"fs";import{parseHTML as p}from"linkedom";import y from"../api/get_api_for_data_functions.js";import $ from"../../lib/get_browser_safe_request.js";import h from"../settings/load.js";import b from"./set_base_attributes_in_html.js";import f from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";import w from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,_=h(),s=process.env.NODE_ENV==="development",{document:g}=p("<div></div>"),j=(e={})=>e?.base_html.replace("${css}",`<style type="text/css" js-css>${e?.css}</style>`).replace('<div id="app"></div>',`
+import u from"fs";import{parseHTML as p}from"linkedom";import y from"os";import $ from"../api/get_api_for_data_functions.js";import f from"../../lib/get_browser_safe_request.js";import h from"../settings/load.js";import w from"./set_base_attributes_in_html.js";import b from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";import g from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,_=h(),s=process.env.NODE_ENV==="development",{document:j}=p("<div></div>"),k=(e={})=>e?.base_html.replace("${css}",`<style type="text/css" js-css>${e?.css}</style>`).replace('<div id="app"></div>',`
 			<div id="app">${e?.html}</div>
 			<script>
 				window.joystick = {
@@ -8,25 +8,26 @@ import u from"fs";import{parseHTML as p}from"linkedom";import y from"../api/get_
 					},
 				};
 
+        window.__joystick_platform__ = '${y.platform()}';
         window.__joystick_data__ = '${Buffer.from(JSON.stringify(e?.data)).toString("base64")}';
        	window.__joystick_i18n__ = ${JSON.stringify(e?.translations)};
         ${s?`window.__joystick_hmr_port__ = ${parseInt(process.env.PORT,10)+1}`:""}
         window.__joystick_layout_url__ = ${e?.render_layout_path?`"/_joystick/${e?.render_layout_path}"`:null};
         window.__joystick_page_url__ = ${e?.render_component_path?`"/_joystick/${e?.render_component_path}"`:null};
-       	window.__joystick_request__ = ${JSON.stringify($(e?.req))};
+       	window.__joystick_request__ = ${JSON.stringify(f(e?.req))};
         window.__joystick_settings__ = ${JSON.stringify({global:_?.global,public:_?.public})};
 
         window.__joystick_should_auto_mount__ = true;
         window.__joystick_ssr_props__ = ${JSON.stringify(e?.props)};
         window.__joystick_url__ = ${JSON.stringify(e?.url)};
-        window.__joystick_user__ = ${JSON.stringify(w(e?.req?.context?.user))};
+        window.__joystick_user__ = ${JSON.stringify(g(e?.req?.context?.user))};
 			</script>
 			<script type="module" src="/_joystick/utils/process.js"></script>
       <script type="module" src="/_joystick/index.client.js"></script>
       ${e?.render_component_path?`<script type="module" src="/_joystick/${e?.render_component_path}"></script>`:""}
       ${e?.render_layout_path?`<script type="module" src="/_joystick/${e?.render_layout_path}"></script>`:""}
       ${s?'<script type="module" src="/_joystick/hmr/client.js"></script>':""}
-		`),k=(e={})=>e?.base_html.replace("${css}",`<style type="text/css">${e?.css}</style>`).replace("${subject}",e?.email_options?.subject).replace("${preheader}",e?.email_options?.preheader||"").replace('<div id="email"></div>',`<div id="email">${e?.html}</div>`),v=(e={})=>e?.is_email?k(e):j(e),N=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.html`)?a(`email/${e?`base_${e}`:"base"}.html`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.html`),""),O=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.css`)?a(`email/${e?`base_${e}`:"base"}.css`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.css`),""),S=(e=null,t={})=>e(t),q=async(e={})=>{const t=S(e?.component_to_render,e?.component_options),c=y(e?.req,e?.api_schema),l=[],r=await t.render_for_ssr(c,e?.req,l,{linkedom_document:g,is_email:e?.is_email}),n=e?.is_email?await O(e?.email_options?.base_html_name):null,o=e?.is_email?await N(e?.email_options?.base_html_name):null,m=v({is_email:e?.is_email,attributes:e?.attributes,base_html:e?.is_email?o:e?.base_html,component_instance:t,css:e?.is_email?`
+		`),v=(e={})=>e?.base_html.replace("${css}",`<style type="text/css">${e?.css}</style>`).replace("${subject}",e?.email_options?.subject).replace("${preheader}",e?.email_options?.preheader||"").replace('<div id="email"></div>',`<div id="email">${e?.html}</div>`),N=(e={})=>e?.is_email?v(e):k(e),O=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.html`)?a(`email/${e?`base_${e}`:"base"}.html`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.html`),""),S=async(e="")=>await i(`email/${e?`base_${e}`:"base"}.css`)?a(`email/${e?`base_${e}`:"base"}.css`,"utf-8"):(console.warn(`Could not find email/${e?`base_${e}`:"base"}.css`),""),q=(e=null,t={})=>e(t),J=async(e={})=>{const t=q(e?.component_to_render,e?.component_options),c=$(e?.req,e?.api_schema),l=[],r=await t.render_for_ssr(c,e?.req,l,{linkedom_document:j,is_email:e?.is_email}),n=e?.is_email?await S(e?.email_options?.base_html_name):null,o=e?.is_email?await O(e?.email_options?.base_html_name):null,m=N({is_email:e?.is_email,attributes:e?.attributes,base_html:e?.is_email?o:e?.base_html,component_instance:t,css:e?.is_email?`
 			${n}
 			${r?.css}
-		`:r?.css,data:r?.data,email_options:e?.email_options,head:e?.head,html:r?.html,props:e?.component_options?.props,render_component_path:e?.render_component_path,render_layout_path:e?.render_layout_path,req:e?.req,translations:e?.component_options?.translations,url:e?.component_options?.url}),d=f(m,e?.head,e?.req);return b(d,e?.attributes)};var L=q;export{L as default};
+		`:r?.css,data:r?.data,email_options:e?.email_options,head:e?.head,html:r?.html,props:e?.component_options?.props,render_component_path:e?.render_component_path,render_layout_path:e?.render_layout_path,req:e?.req,translations:e?.component_options?.translations,url:e?.component_options?.url}),d=b(m,e?.head,e?.req);return w(d,e?.attributes)};var P=J;export{P as default};

package/dist/app/start_node_as_cluster.js

@@ -1 +1 @@
-import r from"cluster";import n from"os";const i=(t=null)=>{const c=n.cpus().length;if(r.isPrimary){for(let s=0;s<c;s++){const e=r.fork();e.joystick_process=s+1,e.on("message",o=>{process.send&&process.send(o)}),process.on("message",o=>{e.send(o)})}r.on("exit",s=>{console.warn(`Worker ${s.process.pid} died.`)})}else t()};var d=i;export{d as default};
+import o from"cluster";import c from"os";const i=(n=null)=>{const t=c.cpus().length;if(o.isPrimary){for(let s=0;s<t;s++){const r=o.fork();r.on("message",e=>{process.send&&process.send(e)}),process.on("message",e=>{r.send(e)})}o.on("exit",s=>{console.warn(`Worker ${s.process.pid} died.`)})}else n()};var d=i;export{d as default};

package/dist/lib/dynamic_import.js

@@ -1 +1 @@
-const a=async(t="")=>(await import(t))?.default;var i=a;export{i as default};
+import a from"./get_platform_safe_path.js";const e=async(t="")=>(await import(a(t)))?.default;var f=e;export{f as default};

package/dist/lib/get_platform_safe_path.js

@@ -0,0 +1 @@
+import t from"os";const e=(r="")=>t.platform()==="win32"?r.replace(/\//g,"\\"):r;var a=e;export{a as default};

package/dist/lib/get_translations.js

@@ -1 +1 @@
-import g from"fs";import p from"./dynamic_import.js";import _ from"../app/settings/load.js";import h from"./path_exists.js";import d from"./types.js";const c=_(),m=async(t="",n="",a="")=>{const r=await p(`${n}/i18n/${t}?v=${new Date().getTime()}`);if(r&&d.is_object(r)){const e=r[a];return e||r}return{}},$=(t="",n=[],a="")=>{let r=[];t&&r.push(t);const i=n?.filter(e=>!e?.includes("*"));return r.push(...i),(c?.config?.i18n?.defaultLanguage||c?.config?.i18n?.default_language)&&r.push(c?.config?.i18n?.defaultLanguage||c?.config?.i18n?.default_language),r?.flatMap(e=>{const s=[e];return e?.length===2&&s.push(`${e.substring(0,2)}-`),e?.length>2&&(s.push(`${e?.split("-")[0]}`),s.push(`${e?.split("-")[0]}-`)),s})?.map(e=>e[e.length-1]==="-"?new RegExp(a?`^${a}_${e}[A-Z]+.js`:`^${e}[A-Z]+.js`,"g"):new RegExp(a?`^${a}_${e}.js`:`^${e}.js`,"g"))},w=(t="")=>t.split(",")?.map(a=>a.split(";")[0]),b=async(t={})=>{const n=t?.is_email?`${t?.joystick_build_path}i18n/email`:`${t?.joystick_build_path}i18n`,a=await h(n)&&g.readdirSync(n)||[],r=t?.is_email?[]:w(t?.req?.headers["accept-language"]),i=$(t?.req?.context?.user?.language,r,t?.email_template_name);let e=null;for(let l=0;l<i.length;l+=1){const u=i[l],f=a.find(o=>!!o.match(u));if(f){e=f;break}}return(e?await m(e,t?.joystick_build_path,t?.render_component_path):null)||{}};var q=b;export{q as default};
+import p from"fs";import _ from"./dynamic_import.js";import f from"./get_platform_safe_path.js";import h from"../app/settings/load.js";import d from"./path_exists.js";import m from"./types.js";const c=h(),$=async(t="",n="",a="")=>{const r=await _(f(`${n}/i18n/${t}?v=${new Date().getTime()}`));if(r&&m.is_object(r)){const e=r[a];return e||r}return{}},w=(t="",n=[],a="")=>{let r=[];t&&r.push(t);const i=n?.filter(e=>!e?.includes("*"));return r.push(...i),(c?.config?.i18n?.defaultLanguage||c?.config?.i18n?.default_language)&&r.push(c?.config?.i18n?.defaultLanguage||c?.config?.i18n?.default_language),r?.flatMap(e=>{const s=[e];return e?.length===2&&s.push(`${e.substring(0,2)}-`),e?.length>2&&(s.push(`${e?.split("-")[0]}`),s.push(`${e?.split("-")[0]}-`)),s})?.map(e=>e[e.length-1]==="-"?new RegExp(a?`^${a}_${e}[A-Z]+.js`:`^${e}[A-Z]+.js`,"g"):new RegExp(a?`^${a}_${e}.js`:`^${e}.js`,"g"))},b=(t="")=>t.split(",")?.map(a=>a.split(";")[0]),j=async(t={})=>{const n=t?.is_email?f(`${t?.joystick_build_path}i18n/email`):f(`${t?.joystick_build_path}i18n`),a=await d(n)&&p.readdirSync(n)||[],r=t?.is_email?[]:b(t?.req?.headers["accept-language"]),i=w(t?.req?.context?.user?.language,r,t?.email_template_name);let e=null;for(let l=0;l<i.length;l+=1){const o=i[l],u=a.find(g=>!!g.match(o));if(u){e=u;break}}return(e?await $(e,t?.joystick_build_path,t?.render_component_path):null)||{}};var E=j;export{E as default};

package/dist/lib/path_exists.js

@@ -1 +1 @@
-import s from"fs";const r=(t="")=>new Promise(e=>{s.access(t,s.constants.F_OK,o=>{e(!o)})});var a=r;export{a as default};
+import t from"fs";import r from"./get_platform_safe_path.js";const a=(s="")=>new Promise(e=>{t.access(r(s),t.constants.F_OK,o=>{e(!o)})});var p=a;export{p as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.450",
+  "version": "0.0.0-canary.451",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/api/test/bootstrap.js

@@ -1,13 +1,16 @@
 import dynamic_import from "../../../lib/dynamic_import.js";
 import get_api_for_data_functions from "../get_api_for_data_functions.js";
 import get_browser_safe_request from "../../../lib/get_browser_safe_request.js";
+import get_platform_safe_path from "../../../lib/get_platform_safe_path.js";
 import get_translations from "../../../lib/get_translations.js";
 import load_settings from "../../settings/load.js";
 
 const test_bootstrap = async (req = {}, res = {}, app_instance = {}) => {
   const joystick_build_path = `${process.cwd()}/.joystick/build/`;
   const component_to_render = req?.query?.path_to_component ?
-  	await dynamic_import(`${joystick_build_path}/${req?.query?.path_to_component}?v=${new Date().getTime()}`) :
+  	await dynamic_import(
+      get_platform_safe_path(`${joystick_build_path}/${req?.query?.path_to_component}?v=${new Date().getTime()}`)
+    ) :
   	null;
 
   if (component_to_render) {

package/src/app/ssr/index.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import { parseHTML } from 'linkedom';
+import os from 'os';
 import get_api_for_data_functions from "../api/get_api_for_data_functions.js";
 import get_browser_safe_request from "../../lib/get_browser_safe_request.js";
 import load_settings from '../settings/load.js';
@@ -29,6 +30,7 @@ const build_html_response_for_browser = (options = {}) => {
 					},
 				};
 
+        window.__joystick_platform__ = '${os.platform()}';
         window.__joystick_data__ = '${Buffer.from(JSON.stringify(options?.data)).toString('base64')}';
        	window.__joystick_i18n__ = ${JSON.stringify(options?.translations)};
         ${is_development ? `window.__joystick_hmr_port__ = ${parseInt(process.env.PORT, 10) + 1}` : ''}

package/src/app/start_node_as_cluster.js

@@ -8,11 +8,6 @@ const start_node_as_cluster = (callback = null) => {
     for (let i = 0; i < cpus; i++) {
       const worker = cluster.fork();
 
-      // NOTE: Intentionally track the worker index on its process so we can
-      // check for a primary in our code (e.g., when running cluster of an app that
-      // has code we only want to run on 1/X workers, not all workers).
-      worker.joystick_process = i + 1;
-
       worker.on("message", (message) => {
         if (process.send) {
           process.send(message);

package/src/lib/dynamic_import.js

@@ -1,5 +1,9 @@
+import get_platform_safe_path from "./get_platform_safe_path.js";
+
 const dynamic_import = async (path = '') => {  
-  const file = await import(path);
+  const file = await import(
+    get_platform_safe_path(path)
+  );
   return file?.default;
 };
 

package/src/lib/get_platform_safe_path.js

@@ -0,0 +1,8 @@
+import os from 'os';
+
+const get_platform_safe_path = (path = '') => {
+  // NOTE: This is why serial killers exist.
+  return os.platform() === "win32" ? path.replace(/\//g, '\\') : path;
+};
+
+export default get_platform_safe_path;

package/src/lib/get_translations.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import dynamic_import from './dynamic_import.js';
+import get_platform_safe_path from './get_platform_safe_path.js';
 import load_settings from "../app/settings/load.js";
 import path_exists from './path_exists.js';
 import types from './types.js';
@@ -7,7 +8,9 @@ import types from './types.js';
 const settings = load_settings();
 
 const get_translations_file = async (language_file_path = '', joystick_build_path = '', render_component_path = '') => {
-  const language_file = await dynamic_import(`${joystick_build_path}/i18n/${language_file_path}?v=${new Date().getTime()}`);
+  const language_file = await dynamic_import(
+    get_platform_safe_path(`${joystick_build_path}/i18n/${language_file_path}?v=${new Date().getTime()}`)
+  );
   const is_valid_language_file = language_file && types.is_object(language_file);
 
   if (is_valid_language_file) {
@@ -68,7 +71,9 @@ const parse_browser_languages = (languages = '') => {
 };
 
 const get_translations = async (get_translations_options = {}) => {
-  const language_files_path = get_translations_options?.is_email ? `${get_translations_options?.joystick_build_path}i18n/email` : `${get_translations_options?.joystick_build_path}i18n`;
+  const language_files_path = get_translations_options?.is_email ?
+    get_platform_safe_path(`${get_translations_options?.joystick_build_path}i18n/email`) :
+    get_platform_safe_path(`${get_translations_options?.joystick_build_path}i18n`);
   const language_files = (await path_exists(language_files_path) && fs.readdirSync(language_files_path)) || [];
   const browser_languages = get_translations_options?.is_email ? [] : parse_browser_languages(get_translations_options?.req?.headers['accept-language']);
   const language_preferences = get_language_preference_regexes(

package/src/lib/path_exists.js

@@ -1,8 +1,9 @@
 import fs from 'fs';
+import get_platform_safe_path from './get_platform_safe_path.js';
 
 const path_exists = (path = '') => {
   return new Promise((resolve) => {
-    fs.access(path, fs.constants.F_OK, error => {
+    fs.access(get_platform_safe_path(path), fs.constants.F_OK, error => {
       resolve(!error);
     });
   });