@joystick.js/node-canary 0.0.0-canary.365 → 0.0.0-canary.367

package/dist/app/middleware/render/index.js

@@ -1 +1 @@
-import w from"fs";import p from"../../../lib/dynamic_import.js";import c from"../generate_joystick_error_page.js";import k from"../../../lib/get_joystick_build_path.js";import j from"../../../lib/get_translations.js";import x from"./get_url.js";import _ from"../../../lib/path_exists.js";import v from"../../ssr/index.js";import z from"../../../lib/get_browser_safe_request.js";const{readFile:A}=w.promises,i=k(),D=()=>A("index.html","utf-8"),T=(s,e,f,d={})=>{e.render=async(n="",t={})=>{const u=n?.substring(0,1)==="/"?n?.replace("/",""):n,r=t?.layout?.substring(0,1)==="/"?t?.layout?.replace("/",""):t?.layout,a=`${i}${u}`,o=t?.layout?`${i}${r}`:null;if(!await _(a))return e.status(404).send(c({type:"page_not_found",path:`res.render('${a}')`,frame:null,stack:`A page component at the path ${a} could not be found.`}));if(o&&!await _(o))return e.status(404).send(c({type:"layout_not_found",path:`res.render('${a}', { layout: '${r}' })`,frame:null,stack:`A layout component at the path ${t?.layout} could not be found.`}));const l=await p(`${a}?v=${new Date().getTime()}`),h=o?await p(`${o}?v=${new Date().getTime()}`):null,m={...t?.props||{}};o&&(m.page=l);const y=await D(),g=await j({joystick_build_path:i,render_component_path:n,req:s}),$=x(s),b=await v({api_schema:d?.options?.api,attributes:t?.attributes,base_html:y,component_options:{props:m,translations:g,url:$},component_to_render:h||l,head:t?.head,render_component_path:u,render_layout_path:r,req:z(s)});return e.status(200).send(b)},f()};var J=T;export{J as default};
+import w from"fs";import p from"../../../lib/dynamic_import.js";import c from"../generate_joystick_error_page.js";import k from"../../../lib/get_joystick_build_path.js";import j from"../../../lib/get_translations.js";import x from"./get_url.js";import _ from"../../../lib/path_exists.js";import v from"../../ssr/index.js";import"../../../lib/get_browser_safe_request.js";const{readFile:z}=w.promises,i=k(),A=()=>z("index.html","utf-8"),D=(s,e,f,d={})=>{e.render=async(n="",t={})=>{const u=n?.substring(0,1)==="/"?n?.replace("/",""):n,r=t?.layout?.substring(0,1)==="/"?t?.layout?.replace("/",""):t?.layout,a=`${i}${u}`,o=t?.layout?`${i}${r}`:null;if(!await _(a))return e.status(404).send(c({type:"page_not_found",path:`res.render('${a}')`,frame:null,stack:`A page component at the path ${a} could not be found.`}));if(o&&!await _(o))return e.status(404).send(c({type:"layout_not_found",path:`res.render('${a}', { layout: '${r}' })`,frame:null,stack:`A layout component at the path ${t?.layout} could not be found.`}));const l=await p(`${a}?v=${new Date().getTime()}`),h=o?await p(`${o}?v=${new Date().getTime()}`):null,m={...t?.props||{}};o&&(m.page=l);const y=await A(),g=await j({joystick_build_path:i,render_component_path:n,req:s}),$=x(s),b=await v({api_schema:d?.options?.api,attributes:t?.attributes,base_html:y,component_options:{props:m,translations:g,url:$},component_to_render:h||l,head:t?.head,render_component_path:u,render_layout_path:r,req:s});return e.status(200).send(b)},f()};var K=D;export{K as default};

package/dist/app/ssr/index.js

@@ -1,4 +1,4 @@
-import p from"fs";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 w from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";const{readFile:a}=p.promises,r=h(),s=process.env.NODE_ENV==="development",f=(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 p from"../api/get_api_for_data_functions.js";import y from"../../lib/get_browser_safe_request.js";import $ from"../settings/load.js";import h from"./set_base_attributes_in_html.js";import b 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,r=$(),s=process.env.NODE_ENV==="development",f=(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 = {
@@ -13,20 +13,20 @@ import p from"fs";import y from"../api/get_api_for_data_functions.js";import $ f
         ${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(y(e?.req))};
         window.__joystick_settings__ = ${JSON.stringify({global:r?.global,public:r?.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(e?.req?.context?.user)};
+        window.__joystick_user__ = ${JSON.stringify(w(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>':""}
-		`),g=(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>`),j=(e={})=>e?.is_email?g(e):f(e),k=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`),""),v=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`),""),N=(e=null,t={})=>e(t),O=async(e={})=>{const t=N(e?.component_to_render,e?.component_options),l=y(e?.req,e?.api_schema),c=[],_=await t.render_for_ssr(l,e?.req,c,{is_email:e?.is_email}),n=e?.is_email?null:$(e?.req),m=e?.is_email?await v(e?.email_options?.base_html_name):null,o=e?.is_email?await k(e?.email_options?.base_html_name):null,d=j({is_email:e?.is_email,attributes:e?.attributes,base_html:e?.is_email?o:e?.base_html,component_instance:t,css:e?.is_email?`
-			${m}
+		`),g=(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>`),j=(e={})=>e?.is_email?g(e):f(e),k=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`),""),v=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`),""),N=(e=null,t={})=>e(t),O=async(e={})=>{const t=N(e?.component_to_render,e?.component_options),l=p(e?.req,e?.api_schema),c=[],_=await t.render_for_ssr(l,e?.req,c,{is_email:e?.is_email}),n=e?.is_email?await v(e?.email_options?.base_html_name):null,o=e?.is_email?await k(e?.email_options?.base_html_name):null,m=j({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}
 			${_?.css}
-		`:_?.css,data:_?.data,email_options:e?.email_options,head:e?.head,html:_?.html,props:e?.component_options?.props,render_component_path:e?.render_component_path,render_layout_path:e?.render_layout_path,req:n,translations:e?.component_options?.translations,url:e?.component_options?.url}),u=w(d,e?.head,e?.req);return b(u,e?.attributes)};var I=O;export{I as default};
+		`:_?.css,data:_?.data,email_options:e?.email_options,head:e?.head,html:_?.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 h(d,e?.attributes)};var P=O;export{P as default};

package/package.json

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

package/src/app/middleware/render/index.js

@@ -81,7 +81,7 @@ const render_middleware = (req, res, next, app_instance = {}) => {
       head: render_options?.head,
       render_component_path: sanitized_render_component_path,
       render_layout_path: sanitized_render_layout_path,
-      req: get_browser_safe_request(req),
+      req,
     });
 
     return res.status(200).send(html);

package/src/app/ssr/index.js

@@ -5,6 +5,7 @@ import load_settings from '../settings/load.js';
 import set_base_attributes_in_html from "./set_base_attributes_in_html.js";
 import set_head_tags_in_html from "./set_head_tags_in_html.js";
 import path_exists from "../../lib/path_exists.js";
+import get_browser_safe_user from '../accounts/get_browser_safe_user.js';
 
 const { readFile } = fs.promises;
 const app_settings = load_settings();
@@ -28,7 +29,7 @@ const build_html_response_for_browser = (options = {}) => {
         ${is_development ? `window.__joystick_hmr_port__ = ${parseInt(process.env.PORT, 10) + 1}` : ''}
         window.__joystick_layout_url__ = ${options?.render_layout_path ? `"/_joystick/${options?.render_layout_path}"` : null};
         window.__joystick_page_url__ = ${options?.render_component_path ? `"/_joystick/${options?.render_component_path}"` : null};
-       	window.__joystick_request__ = ${JSON.stringify(options?.req)};
+       	window.__joystick_request__ = ${JSON.stringify(get_browser_safe_request(options?.req))};
         window.__joystick_settings__ = ${JSON.stringify({
           global: app_settings?.global,
           public: app_settings?.public,
@@ -37,7 +38,7 @@ const build_html_response_for_browser = (options = {}) => {
         window.__joystick_should_auto_mount__ = true;
         window.__joystick_ssr_props__ = ${JSON.stringify(options?.props)};
         window.__joystick_url__ = ${JSON.stringify(options?.url)};
-        window.__joystick_user__ = ${JSON.stringify(options?.req?.context?.user)};
+        window.__joystick_user__ = ${JSON.stringify(get_browser_safe_user(options?.req?.context?.user))};
 			</script>
 			<script type="module" src="/_joystick/utils/process.js"></script>
       <script type="module" src="/_joystick/index.client.js"></script>
@@ -88,7 +89,6 @@ const ssr = async (ssr_options = {}) => {
 	const api = get_api_for_data_functions(ssr_options?.req, ssr_options?.api_schema);
 	const ssr_tree = [];
 	const ssr_render = await component_instance.render_for_ssr(api, ssr_options?.req, ssr_tree, { is_email: ssr_options?.is_email });
-	const browser_safe_request = ssr_options?.is_email ? null : get_browser_safe_request(ssr_options?.req);
 	const email_base_css = ssr_options?.is_email ? await get_base_css_for_email(ssr_options?.email_options?.base_html_name) : null;
 	const email_base_html = ssr_options?.is_email ? await get_base_html_for_email(ssr_options?.email_options?.base_html_name) : null;
 
@@ -108,7 +108,7 @@ const ssr = async (ssr_options = {}) => {
 		props: ssr_options?.component_options?.props,
 		render_component_path: ssr_options?.render_component_path,
 		render_layout_path: ssr_options?.render_layout_path,
-		req: browser_safe_request,
+		req: ssr_options?.req,
 		translations: ssr_options?.component_options?.translations,
 		url: ssr_options?.component_options?.url,
 	});

package/src/lib/get_browser_safe_request.js

@@ -8,7 +8,7 @@ const get_browser_safe_request = (req = {}) => {
   browser_safe_request.params = escape_key_value_pair(req.params);
   browser_safe_request.query = escape_key_value_pair(req.query);
   browser_safe_request.context = {
-    user: get_browser_safe_user(req.context.user)
+    user: get_browser_safe_user(req.context.user),
   };
 
   return browser_safe_request;