@joystick.js/node-canary 0.0.0-canary.374 → 0.0.0-canary.376

package/dist/app/api/get.js

@@ -1,2 +1,2 @@
 import p from"./format_api_error.js";import f from"./get_output.js";import h from"../../lib/get_sanitized_context.js";import z from"./sanitize_api_response.js";import d from"../../test/track_function_call.js";import n from"../../lib/types.js";import m from"./validate_input.js";const _=async(o="",t={},r=null,s=null,a={},u={})=>{const l=t?.sanitize===!1,i=(t?.sanitize||u?.sanitize)===!0;d(`node.api.getters.${o}`,[r,h(a)]);const e=await t?.get(r,a),c=s?f(e,s):e;return!l&&i?z(c):c},w=async(o="",t={},r={},s={})=>{d(`node.api.getters.${o}.authorized`,[r,h(s)]);const a=await t?.authorized(r,s);if(typeof a=="boolean")return a;if(n.is_object(a)&&!n.is_array(a)&&!n.is_undefined(a?.authorized))return a?.authorized?!0:a?.message},y=(o=[],t="")=>{console.log(`Input validation for getter "${t}" failed with the following errors:
-`);for(let r=0;r<o?.length;r+=1){const s=o[r];console.log(`${r+1}. ${s}`)}},$=(o={},t={})=>m(o,t),v=async({get_name:o,get_options:t,getter_definition:r,request_context:s,api_schema_options:a})=>{const u=r?.input&&Object.keys(r?.input)?.length>0,l=n.is_function(r?.authorized);if(u){const i=await $(t?.input,r?.input);if(i?.length>0)return y(i,o),Promise.reject({errors:i.map(e=>p(new Error(e),`getters.${o}.input`,401))})}if(l){const i=await w(o,r,t?.input,s);if(!i||n.is_string(i))return Promise.reject({errors:[p(new Error(typeof i=="string"?i:`Not authorized to access ${o}.`),`getters.${o}.authorized`,403)]})}if(n.is_function(r?.get)){const i=await _(o,r,t?.input,t?.output,s,a);return Promise.resolve(i)}};var N=v;export{N as default};
+`);for(let r=0;r<o?.length;r+=1){const s=o[r];console.log(`${r+1}. ${s}`)}},$=(o={},t={})=>m(o,t),v=async({get_name:o,get_options:t,getter_definition:r,request_context:s,api_schema_options:a})=>{const u=r?.input&&Object.keys(r?.input)?.length>0,l=n.is_function(r?.authorized);if(u){const i=await $(t?.input,r?.input);if(i?.length>0)return y(i,o),Promise.reject({errors:i.map(e=>p(new Error(e),`getters.${o}.input`,400))})}if(l){const i=await w(o,r,t?.input,s);if(!i||n.is_string(i))return Promise.reject({errors:[p(new Error(typeof i=="string"?i:`Not authorized to access ${o}.`),`getters.${o}.authorized`,403)]})}if(n.is_function(r?.get)){const i=await _(o,r,t?.input,t?.output,s,a);return Promise.resolve(i)}};var N=v;export{N as default};

package/dist/app/api/input_validators.js

@@ -1 +1 @@
-import i from"../../lib/types.js";import d from"./validate_type.js";import f from"./is_array_path.js";const c={types:["any","array","boolean","float","integer","number","object","string"],rules:{allowedValues:(r,e,t)=>r.includes(e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} only allows the following values: ${r.join(", ")}.`]},element:async(r,e,t,s)=>{if(e&&(i.is_object(r)||i.is_string(r))&&i.is_array(e)){const o=await Promise.all(e.flatMap(async(a,l)=>(await s(a,i.is_string(r)?{type:r}:r,`${t}.${l}`)).flatMap(n=>n)));return{valid:o.length===0,errors:o.flatMap(a=>a)}}return{valid:!0,errors:[]}},fields:async(r,e,t,s)=>{if(i.is_object(r)&&i.is_object(e)){const o=f(t)?e:{[t]:e},a=await s(o,r,t);return{valid:a.length===0,errors:[...a]}}return{valid:!1,errors:[`Field ${t} must be of type object.`]}},max:(r,e,t)=>e<=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must be less than or equal to ${r}.`]},maxLength:(r,e,t)=>i.is_array(e)&&e?.length<=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} length must be less than or equal to ${r}.`]},min:(r,e,t)=>e>=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must be greater than or equal to ${r}.`]},minLength:(r,e,t)=>i.is_array(e)&&e?.length>=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} length must be greater than or equal to ${r}.`]},optional:(r,e,t)=>(r===!1?!!e:!0)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} is required.`]},regex:(r,e,t)=>new RegExp(r).test(e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must conform to regex: ${r}.`]},required:(r,e,t)=>(r===!1?!0:!!e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} is required.`]},type:(r,e,t)=>{const s=d(r,e);return e&&!s?{valid:!1,errors:[`Field ${t} must be of type ${r}.`]}:{valid:!0,errors:[]}}}};var g=c;export{g as default};
+import i from"../../lib/types.js";import m from"./validate_type.js";import v from"./is_array_path.js";const l=(r,e,t)=>r.includes(e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} only allows the following values: ${r.join(", ")}.`]},n=(r,e,t)=>i.is_array(e)&&e?.length<=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} length must be less than or equal to ${r}.`]},d=(r,e,t)=>i.is_array(e)&&e?.length>=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} length must be greater than or equal to ${r}.`]},g={types:["any","array","boolean","float","integer","number","object","string"],rules:{allowed_values:l,allowedValues:l,element:async(r,e,t,s)=>{if(e&&(i.is_object(r)||i.is_string(r))&&i.is_array(e)){const a=await Promise.all(e.flatMap(async(o,f)=>(await s(o,i.is_string(r)?{type:r}:r,`${t}.${f}`)).flatMap(c=>c)));return{valid:a.length===0,errors:a.flatMap(o=>o)}}return{valid:!0,errors:[]}},fields:async(r,e,t,s)=>{if(i.is_object(r)&&i.is_object(e)){const a=v(t)?e:{[t]:e},o=await s(a,r,t);return{valid:o.length===0,errors:[...o]}}return{valid:!1,errors:[`Field ${t} must be of type object.`]}},max:(r,e,t)=>e<=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must be less than or equal to ${r}.`]},max_length:n,maxLength:n,min:(r,e,t)=>e>=r?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must be greater than or equal to ${r}.`]},min_length:d,minLength:d,optional:(r,e,t)=>(r===!1?!!e:!0)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} is required.`]},regex:(r,e,t)=>new RegExp(r).test(e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} must conform to regex: ${r}.`]},required:(r,e,t)=>(r===!1?!0:!!e)?{valid:!0,errors:[]}:{valid:!1,errors:[`Field ${t} is required.`]},type:(r,e,t)=>{const s=m(r,e);return e&&!s?{valid:!1,errors:[`Field ${t} must be of type ${r}.`]}:{valid:!0,errors:[]}}}};var h=g;export{h 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 w from"./set_head_tags_in_html.js";import i from"../../lib/path_exists.js";import f from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,r=h(),s=process.env.NODE_ENV==="development",{document:g}=p("<div></div>");document=g;const 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"../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";import f from"../accounts/get_browser_safe_user.js";const{readFile:a}=u.promises,r=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>',`
 			<div id="app">${e?.html}</div>
 			<script>
 				window.joystick = {
@@ -26,7 +26,7 @@ import u from"fs";import{parseHTML as p}from"linkedom";import y from"../api/get_
       ${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`),""),q=(e=null,t={})=>e(t),J=async(e={})=>{const t=q(e?.component_to_render,e?.component_options),c=y(e?.req,e?.api_schema),l=[],_=await t.render_for_ssr(c,e?.req,l,{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?`
+		`),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`),""),q=(e=null,t={})=>e(t),J=async(e={})=>{const t=q(e?.component_to_render,e?.component_options),c=y(e?.req,e?.api_schema),l=[],_=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?`
 			${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:e?.req,translations:e?.component_options?.translations,url:e?.component_options?.url}),d=w(m,e?.head,e?.req);return b(d,e?.attributes)};var M=J;export{M as default};

package/package.json

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

package/src/app/api/get.js

@@ -80,7 +80,7 @@ const get = async ({
 
 		  return Promise.reject({
 	      errors: validation_errors.map((error) => {
-	        return format_api_error(new Error(error), `getters.${get_name}.input`, 401);
+	        return format_api_error(new Error(error), `getters.${get_name}.input`, 400);
 	      }),
 	    });
 		}

package/src/app/api/input_validators.js

@@ -2,6 +2,62 @@ import types from '../../lib/types.js';
 import validate_type from "./validate_type.js";
 import is_array_path from "./is_array_path.js";
 
+const allowed_values = (rule_value, input_value, parent_path) => {
+  const isValid = rule_value.includes(input_value);
+
+  if (!isValid) {
+    return {
+      valid: false,
+      errors: [
+        `Field ${parent_path} only allows the following values: ${rule_value.join(
+          ", "
+        )}.`,
+      ],
+    };
+  }
+
+  return {
+    valid: true,
+    errors: [],
+  };
+};
+
+const max_length = (rule_value, input_value, parent_path) => {
+  const valid = types.is_array(input_value) && input_value?.length <= rule_value;
+
+  if (!valid) {
+    return {
+      valid: false,
+      errors: [
+        `Field ${parent_path} length must be less than or equal to ${rule_value}.`,
+      ],
+    };
+  }
+
+  return {
+    valid: true,
+    errors: [],
+  };
+};
+
+const min_length = (rule_value, input_value, parent_path) => {
+  const valid = types.is_array(input_value) && input_value?.length >= rule_value;
+
+  if (!valid) {
+    return {
+      valid: false,
+      errors: [
+        `Field ${parent_path} length must be greater than or equal to ${rule_value}.`,
+      ],
+    };
+  }
+
+  return {
+    valid: true,
+    errors: [],
+  };
+};
+
 const input_validators = {
   types: [
 	  "any",
@@ -14,25 +70,8 @@ const input_validators = {
 	  "string",
 	],
   rules: {
-    allowedValues: (rule_value, input_value, parent_path) => {
-      const isValid = rule_value.includes(input_value);
-
-      if (!isValid) {
-        return {
-          valid: false,
-          errors: [
-            `Field ${parent_path} only allows the following values: ${rule_value.join(
-              ", "
-            )}.`,
-          ],
-        };
-      }
-
-      return {
-        valid: true,
-        errors: [],
-      };
-    },
+    allowed_values,
+    allowedValues: allowed_values,
     element: async (rule_value, input_value, parent_path, validate_input) => {
       // NOTE: Allow for element to be passed as a type string so you can do arrays of single
       // primitive elements (e.g., ['a', 'b', 'c'] or [1, 2, 3]).
@@ -110,23 +149,8 @@ const input_validators = {
         errors: [],
       };
     },
-    maxLength: (rule_value, input_value, parent_path) => {
-      const valid = types.is_array(input_value) && input_value?.length <= rule_value;
-
-      if (!valid) {
-        return {
-          valid: false,
-          errors: [
-            `Field ${parent_path} length must be less than or equal to ${rule_value}.`,
-          ],
-        };
-      }
-
-      return {
-        valid: true,
-        errors: [],
-      };
-    },
+    max_length,
+    maxLength: max_length,
     min: (rule_value, input_value, parent_path) => {
       const valid = input_value >= rule_value;
 
@@ -144,23 +168,8 @@ const input_validators = {
         errors: [],
       };
     },
-    minLength: (rule_value, input_value, parent_path) => {
-      const valid = types.is_array(input_value) && input_value?.length >= rule_value;
-
-      if (!valid) {
-        return {
-          valid: false,
-          errors: [
-            `Field ${parent_path} length must be greater than or equal to ${rule_value}.`,
-          ],
-        };
-      }
-
-      return {
-        valid: true,
-        errors: [],
-      };
-    },
+    min_length,
+    minLength: min_length,
     optional: (rule_value, input_value, parent_path) => {
       const valid = rule_value === false ? !!input_value : true;
 

package/src/app/ssr/index.js

@@ -15,7 +15,6 @@ const is_development = process.env.NODE_ENV === 'development';
 // NOTE: Set a global document so we have access to a pseudo-DOM in @joystick.js/ui
 // when server-side rendering.
 const { document: linkedom_document } = parseHTML('<div></div>');
-document = linkedom_document;
 
 const build_html_response_for_browser = (options = {}) => {
 	return options?.base_html
@@ -94,7 +93,10 @@ const ssr = async (ssr_options = {}) => {
 	const component_instance = get_component_instance(ssr_options?.component_to_render, ssr_options?.component_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 ssr_render = await component_instance.render_for_ssr(api, ssr_options?.req, ssr_tree, {
+		linkedom_document,
+		is_email: ssr_options?.is_email
+	});
 	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;