@joystick.js/node-canary 0.0.0-canary.409 → 0.0.0-canary.410

package/dist/app/api/input_validators.js

@@ -1 +1 @@
-import i from"../../lib/types.js";import m from"./validate_type.js";import"./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}.`]},v={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=await s(e,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}.`]},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 b=v;export{b as default};
+import i from"../../lib/types.js";import m from"./validate_type.js";import g 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}.`]},v={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=(g(t),e);console.log("FIELDS",{input:a,rule_value:r,parent_path:t});const 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=v;export{h as default};

package/dist/app/api/validate_input.js

@@ -1 +1 @@
-import d from"./get_value_from_object.js";import y from"./input_validators.js";import b from"./is_array_path.js";import _ from"../../lib/types.js";const j=(t=null,r="",e=!1)=>{if(r&&!_.is_string(r))throw new Error("path must be passed as a string");if(e||!e&&!_.is_object(t))return t;if(r.includes(".$.")){const[o]=r.split(".$.");return d(t,o)}return d(t,r)},w=(t="")=>{if(!t)return"";if(t&&!_.is_string(t))throw new Error("array_path must be a type of string");return t.split(".").pop()},m=({queue:t,rules:r,input:e,path:o,types_only_schema:n})=>{r&&r.type==="object"&&(t=p(t,r.properties,e,o)),r&&r.type==="array"&&_.is_object(r.element)&&(t=p(t,r.element,e,`${o}.$`));const s=b(o)?w(o):o;return{path:o,rules:r,input_value:j(e,s,n)}},p=(t=[],r={},e={},o="")=>{const n=!!(r.type&&y.types.includes(r.type));if(!n){const s=Object.entries(r||{});for(let a=0;a<s?.length;a+=1){const[c,l]=s[a],i=m({queue:t,rules:l,input:e,path:c,types_only_schema:n});t=[...t,i]}}if(n){const s=m({queue:t,rules:r,input:e,path:o,types_only_schema:n});t=[...t,s]}return t},v=async(t={},r={},e="")=>{const o=[],n=p([],r,t,e);return await Promise.all(n.flatMap(s=>Object.entries(s.rules||{}).flatMap(async([a,c])=>{const l=y.rules[a];if(l&&!s.path.includes(".$.")){const i=await l(c,s.input_value,s.path,v);if(i&&!i.valid)for(let f=0;f<i.errors.length;f+=1){const g=i.errors[f];o.push(g)}}}))),o};var E=v;export{E as default,j as handle_get_input_value};
+import p from"./get_value_from_object.js";import v from"./input_validators.js";import $ from"./is_array_path.js";import f from"../../lib/types.js";const y=(t=null,r="",s=!1)=>{if(r&&!f.is_string(r))throw new Error("path must be passed as a string");if(s||!s&&!f.is_object(t))return t;if(r.includes(".$.")){const[o]=r.split(".$.");return p(t,o)}return p(t,r)},j=(t="")=>{if(!t)return"";if(t&&!f.is_string(t))throw new Error("array_path must be a type of string");return t.split(".").pop()},g=({queue:t,rules:r,input:s,path:o,types_only_schema:n})=>{r&&r.type==="object"&&(t=d(t,r.properties,s,o)),r&&r.type==="array"&&f.is_object(r.element)&&(t=d(t,r.element,s,`${o}.$`));const e=$(o)?j(o):o;return console.log({path:o,path_to_value:e,input:s,input_value:y(s,e,n),rules:r}),{path:o,rules:r,input_value:y(s,e,n)}},d=(t=[],r={},s={},o="")=>{const n=!!(r.type&&v.types.includes(r.type));if(!n){const e=Object.entries(r||{});for(let i=0;i<e?.length;i+=1){const[l,c]=e[i];console.log({field:l,rules:c});const a=`${o?`${o}.${l}`:l}`,_=g({queue:t,rules:c,input:s,path:a,types_only_schema:n});t=[...t,_]}}if(n){const e=o,i=g({queue:t,rules:r,input:s,path:field,types_only_schema:n});t=[...t,i]}return t},m=async(t={},r={},s="")=>{const o=[],n=d([],r,t,s);return await Promise.all(n.flatMap(e=>Object.entries(e.rules||{}).flatMap(async([i,l])=>{const c=v.rules[i];if(c&&!e.path.includes(".$.")){const a=await c(l,e.input_value,e.path,m);if(a&&!a.valid)for(let _=0;_<a.errors.length;_+=1){const b=a.errors[_];o.push(b)}}}))),o};var M=m;export{M as default,y as handle_get_input_value};

package/package.json

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

package/src/app/api/input_validators.js

@@ -110,7 +110,22 @@ const input_validators = {
     },
     fields: async (rule_value, input_value, parent_path, validate_input) => {
       if (types.is_object(rule_value) && types.is_object(input_value)) {
-        const errors = await validate_input(input_value, rule_value, parent_path);
+        // NOTE: Complex. If we're NOT dealing with an array path, we're dealing with a normal
+        // object path. Based on the schema structure for the type "object", fields: {} rules,
+        // and how we run this all recursively, if we're dealing with an object path, we need to
+        // "tack back on" wrap the parent field around the input_value (child). This ensures that
+        // the value path actually exists when this runs recursively (and the validator works).
+        const input = is_array_path(parent_path)
+          ? input_value
+          : input_value;
+
+        console.log('FIELDS', {
+          input,
+          rule_value,
+          parent_path,
+        });
+        
+        const errors = await validate_input(input, rule_value, parent_path);
 
         return {
           valid: errors.length === 0,

package/src/app/api/validate_input.js

@@ -49,6 +49,14 @@ const add_validation_task = ({ queue, rules, input, path, types_only_schema }) =
 
   const path_to_value = is_array_path(path) ? get_array_path_key(path) : path;
 
+  console.log({
+    path,
+    path_to_value,
+    input,
+    input_value: handle_get_input_value(input, path_to_value, types_only_schema),
+    rules,
+  })
+
   return {
     path,
     rules,
@@ -73,11 +81,14 @@ const add_to_validation_queue = (
 
   	for (let i = 0; i < schema_definitions?.length; i += 1) {
   		const [field, rules] = schema_definitions[i];
+      console.log({ field, rules });
+      // TODO: Prefixing parent_path is WRONG under certain conditions. Which?
+  		const path = `${parent_path ? `${parent_path}.${field}` : field}`;
       const validation_task = add_validation_task({
         queue,
         rules,
         input,
-        path: field,
+        path,
         types_only_schema,
       });
 
@@ -86,11 +97,12 @@ const add_to_validation_queue = (
   }
 
   if (types_only_schema) {
+    const path = parent_path;
     const validation_task = add_validation_task({
       queue,
       rules: schema,
       input,
-      path: parent_path,
+      path: field,
       types_only_schema,
     });
 
@@ -101,6 +113,8 @@ const add_to_validation_queue = (
 };
 
 const validate_input = async (input = {}, schema = {}, parent_path = '') => {
+  // console.log(input);
+
 	const validation_errors = [];
 	const queue = add_to_validation_queue([], schema, input, parent_path);