@stacksjs/validation 0.75.514 → 0.75.518

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- function when(field,match,refine){if(!this.__conditionals)this.__conditionals=[];this.__conditionals.push({field,match,refine});return this}function sometimes(){this.optional();return this}export function withConditionals(validator){const augmented=validator;augmented.when=when;augmented.sometimes=sometimes;return augmented}export function shouldApplyConditional(record,parent){if(parent===null||parent===void 0)return!1;const siblingValue=Object.hasOwn(parent,record.field)?parent[record.field]:void 0;if(typeof record.match==="function")return record.match(siblingValue);return siblingValue===record.match}export function applyConditionals(base,parent){const records=base.__conditionals;if(!records||records.length===0)return base;let working=null;for(const record of records){if(!shouldApplyConditional(record,parent))continue;if(working===null)working=cloneValidator(base);working=record.refine(working)}return working??base}function cloneValidator(v){const clone=Object.create(Object.getPrototypeOf(v));Object.assign(clone,v);const rules=v.rules;if(Array.isArray(rules))clone.rules=rules.slice();return clone}
1
+ function when(field,match,refine){if(!this.__conditionals)this.__conditionals=[];this.__conditionals.push({field,match,refine});return this}function sometimes(){this.optional();return this}export function withConditionals(validator){const augmented=validator;augmented.when=when;augmented.sometimes=sometimes;return augmented}export function shouldApplyConditional(record,parent){if(parent===null||parent===undefined)return false;const siblingValue=Object.hasOwn(parent,record.field)?parent[record.field]:undefined;if(typeof record.match==="function"){return record.match(siblingValue)}return siblingValue===record.match}export function applyConditionals(base,parent){const records=base.__conditionals;if(!records||records.length===0)return base;let working=null;for(const record of records){if(!shouldApplyConditional(record,parent))continue;if(working===null)working=cloneValidator(base);working=record.refine(working)}return working??base}function cloneValidator(v){const clone=Object.create(Object.getPrototypeOf(v));Object.assign(clone,v);const rules=v.rules;if(Array.isArray(rules))clone.rules=rules.slice();return clone}
@@ -1 +1 @@
1
- const IMAGE_MIMETYPES=new Set(["image/jpeg","image/png","image/webp","image/gif","image/avif"]);function mimetypeOf(file){return file.mimetype??file.mimeType}function originalNameOf(file){return file.originalName??file.name}function extensionOf(file){const name=originalNameOf(file);if(!name)return null;const idx=name.lastIndexOf(".");if(idx<=0||idx===name.length-1)return null;const ext=name.slice(idx+1).toLowerCase();return/^[a-z0-9]+$/.test(ext)?ext:null}export class FileValidator{_required=!1;_rules=[];required(){this._required=!0;return this}image(){this._rules.push((file)=>{const mime=mimetypeOf(file);if(!mime||!IMAGE_MIMETYPES.has(mime.toLowerCase()))return`must be an image (got ${mime||"no mimetype"})`;return null});return this}mimeTypes(allowed){const normalized=new Set(allowed.map((m)=>m.toLowerCase()));this._rules.push((file)=>{const mime=mimetypeOf(file);if(!mime||!normalized.has(mime.toLowerCase()))return`must be one of: ${allowed.join(", ")} (got ${mime||"no mimetype"})`;return null});return this}maxBytes(max){if(!Number.isSafeInteger(max)||max<0)throw RangeError("maxBytes must be a non-negative safe integer");this._rules.push((file)=>{if(typeof file.size!=="number")return"has no size - cannot enforce maxBytes";if(file.size>max)return`is too large: ${file.size} bytes exceeds the ${max}-byte cap`;return null});return this}minBytes(min){if(!Number.isSafeInteger(min)||min<0)throw RangeError("minBytes must be a non-negative safe integer");this._rules.push((file)=>{if(typeof file.size!=="number")return"has no size - cannot enforce minBytes";if(file.size<min)return`is too small: ${file.size} bytes is below the ${min}-byte minimum`;return null});return this}extensions(allowed){const normalized=new Set(allowed.map((e)=>e.toLowerCase().replace(/^\./,"")));this._rules.push((file)=>{const ext=extensionOf(file);if(!ext||!normalized.has(ext))return`must have one of these extensions: ${allowed.join(", ")} (got ${ext?`.${ext}`:"no extension"})`;return null});return this}custom(rule){this._rules.push(rule);return this}validate(value){if(value===null||value===void 0){if(this._required)return{valid:!1,errors:[{message:"is required"}]};return{valid:!0}}if(typeof value!=="object"||isPlainObject(value)||!Number.isSafeInteger(value.size)||value.size<0)return{valid:!1,errors:[{message:"must be an uploaded file"}]};const file=value;for(const field of["mimetype","mimeType","originalName","name"]){const metadata=file[field];if(metadata!==void 0&&typeof metadata!=="string")return{valid:!1,errors:[{message:`has invalid ${field} metadata`}]}}const errors=[];for(const rule of this._rules){const msg=rule(file);if(msg)errors.push({message:msg})}return errors.length===0?{valid:!0}:{valid:!1,errors}}}function isPlainObject(value){const proto=Object.getPrototypeOf(value);return proto===Object.prototype||proto===null}export function file(){return new FileValidator}
1
+ const IMAGE_MIMETYPES=new Set(["image/jpeg","image/png","image/webp","image/gif","image/avif"]);function mimetypeOf(file){return file.mimetype??file.mimeType}function originalNameOf(file){return file.originalName??file.name}function extensionOf(file){const name=originalNameOf(file);if(!name)return null;const idx=name.lastIndexOf(".");if(idx<=0||idx===name.length-1)return null;const ext=name.slice(idx+1).toLowerCase();return/^[a-z0-9]+$/.test(ext)?ext:null}export class FileValidator{_required=false;_rules=[];required(){this._required=true;return this}image(){this._rules.push((file)=>{const mime=mimetypeOf(file);if(!mime||!IMAGE_MIMETYPES.has(mime.toLowerCase()))return`must be an image (got ${mime||"no mimetype"})`;return null});return this}mimeTypes(allowed){const normalized=new Set(allowed.map((m)=>m.toLowerCase()));this._rules.push((file)=>{const mime=mimetypeOf(file);if(!mime||!normalized.has(mime.toLowerCase()))return`must be one of: ${allowed.join(", ")} (got ${mime||"no mimetype"})`;return null});return this}maxBytes(max){if(!Number.isSafeInteger(max)||max<0)throw new RangeError("maxBytes must be a non-negative safe integer");this._rules.push((file)=>{if(typeof file.size!=="number")return"has no size - cannot enforce maxBytes";if(file.size>max)return`is too large: ${file.size} bytes exceeds the ${max}-byte cap`;return null});return this}minBytes(min){if(!Number.isSafeInteger(min)||min<0)throw new RangeError("minBytes must be a non-negative safe integer");this._rules.push((file)=>{if(typeof file.size!=="number")return"has no size - cannot enforce minBytes";if(file.size<min)return`is too small: ${file.size} bytes is below the ${min}-byte minimum`;return null});return this}extensions(allowed){const normalized=new Set(allowed.map((e)=>e.toLowerCase().replace(/^\./,"")));this._rules.push((file)=>{const ext=extensionOf(file);if(!ext||!normalized.has(ext))return`must have one of these extensions: ${allowed.join(", ")} (got ${ext?`.${ext}`:"no extension"})`;return null});return this}custom(rule){this._rules.push(rule);return this}validate(value){if(value===null||value===undefined){if(this._required)return{valid:false,errors:[{message:"is required"}]};return{valid:true}}if(typeof value!=="object"||isPlainObject(value)||!Number.isSafeInteger(value.size)||value.size<0){return{valid:false,errors:[{message:"must be an uploaded file"}]}}const file=value;for(const field of["mimetype","mimeType","originalName","name"]){const metadata=file[field];if(metadata!==undefined&&typeof metadata!=="string")return{valid:false,errors:[{message:`has invalid ${field} metadata`}]}}const errors=[];for(const rule of this._rules){const msg=rule(file);if(msg)errors.push({message:msg})}return errors.length===0?{valid:true}:{valid:false,errors}}}function isPlainObject(value){const proto=Object.getPrototypeOf(value);return proto===Object.prototype||proto===null}export function file(){return new FileValidator}
package/dist/index.js CHANGED
@@ -1 +1 @@
1
- export{schema}from"./schema";export{applyConditionals,objectWithContext,shouldApplyConditional,withConditionals}from"./schema";export*from"@stacksjs/ts-validation";export*from"./input";export*from"./messages";export*from"./reporter";export*from"./validator";export function isString(value){return typeof value==="string"}export function isNumber(value){return typeof value==="number"&&!Number.isNaN(value)}export function isBoolean(value){return typeof value==="boolean"}export function isObject(value){return typeof value==="object"&&value!==null&&!Array.isArray(value)}export function isArray(value){return Array.isArray(value)}export function isFunction(value){return typeof value==="function"}export function isUndefined(value){return value===void 0}export function isNull(value){return value===null}export function isNullOrUndefined(value){return value===null||value===void 0}
1
+ export{schema}from"./schema";export{applyConditionals,objectWithContext,shouldApplyConditional,withConditionals}from"./schema";export*from"@stacksjs/ts-validation";export*from"./input";export*from"./messages";export*from"./reporter";export*from"./validator";export function isString(value){return typeof value==="string"}export function isNumber(value){return typeof value==="number"&&!Number.isNaN(value)}export function isBoolean(value){return typeof value==="boolean"}export function isObject(value){return typeof value==="object"&&value!==null&&!Array.isArray(value)}export function isArray(value){return Array.isArray(value)}export function isFunction(value){return typeof value==="function"}export function isUndefined(value){return value===undefined}export function isNull(value){return value===null}export function isNullOrUndefined(value){return value===null||value===undefined}
package/dist/input.js CHANGED
@@ -1 +1 @@
1
- import{applyConditionals}from"./conditional";export class InputValidationError extends Error{status=422}export async function readJsonObject(request){let body;try{body=await request.json()}catch{throw new InputValidationError("Send a valid JSON object")}if(!body||typeof body!=="object"||Array.isArray(body))throw new InputValidationError("Send a JSON object");return body}export function parsePositiveId(value){if(typeof value!=="string"&&typeof value!=="number")throw new InputValidationError("Invalid identifier");if(typeof value==="string"&&!/^\d+$/.test(value.trim()))throw new InputValidationError("Invalid identifier");const id=Number(value);if(!Number.isSafeInteger(id)||id<=0)throw new InputValidationError("Invalid identifier");return id}export function parseTextInput(value,field,required=!1,maxLength){if(maxLength!==void 0&&(!Number.isSafeInteger(maxLength)||maxLength<0))throw RangeError("Text length must be a non-negative safe integer");if(value==null&&!required)return null;if(typeof value!=="string")throw new InputValidationError(`${field} must be text`);const text=value.trim();if(maxLength!==void 0&&[...text].length>maxLength)throw new InputValidationError(`${field} is too long`);if(!text&&required)throw new InputValidationError(`${field} is required`);return text||null}export function parseNumberInput(value,field,min,max,integer=!1){if(typeof min!=="number"||typeof max!=="number"||Number.isNaN(min)||Number.isNaN(max)||min>max||min===1/0||max===-1/0)throw RangeError("Invalid numeric bounds");if(value==null||value==="")return null;if(typeof value!=="number"&&typeof value!=="string"||typeof value==="string"&&!/^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i.test(value.trim()))throw new InputValidationError(`${field} must be a number`);const number=Number(value);if(!Number.isFinite(number)||number<min||number>max||Number.isInteger(number)&&!Number.isSafeInteger(number)||integer&&!Number.isInteger(number))throw new InputValidationError(`${field} is out of range`);return number}export function parseBooleanInput(value,field){if(value===void 0)return;if(value===!0||value==="true"||value===1||value==="1"||value==="on")return!0;if(value===!1||value==="false"||value===0||value==="0"||value==="off")return!1;throw new InputValidationError(`${field} must be a boolean`)}export function validateModelInput(model,values){const attributes=model.getDefinition().attributes??{},context=Object.assign(Object.create(null),values);for(const field of Object.keys(attributes)){const column=field.replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/([A-Z])([A-Z][a-z])/g,"$1_$2").toLowerCase();if(Object.hasOwn(values,field)||Object.hasOwn(values,column))context[field]=context[column]=Object.hasOwn(values,field)?values[field]:values[column]}for(const[field,value]of Object.entries(values)){const attribute=Object.prototype.hasOwnProperty.call(attributes,field)?field:Object.keys(attributes).find((key)=>key===field||key.replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/([A-Z])([A-Z][a-z])/g,"$1_$2").toLowerCase()===field),rule=attribute?attributes[attribute]?.validation?.rule:void 0;if(rule&&!applyConditionals(rule,context).validate(value).valid)throw new InputValidationError(`Invalid ${field.replaceAll("_"," ")}`)}}export function isEnumInput(value,choices){return typeof value==="string"&&choices.includes(value)}export function parseEnumInput(value,field,choices){if(!isEnumInput(value,choices))throw new InputValidationError(`${field} must be ${choices.join(", ")}`);return value}export function parseEnumListInput(value,field,choices,minItems=1,maxItems=100){if(!Number.isSafeInteger(minItems)||!Number.isSafeInteger(maxItems)||minItems<0||maxItems<minItems)throw RangeError("Invalid enum list bounds");if(!Array.isArray(value)||value.length<minItems||value.length>maxItems)throw new InputValidationError(`${field} must contain ${minItems} to ${maxItems} entries`);const unique=[...new Set(Array.from(value,(item)=>parseEnumInput(item,field,choices)))];if(unique.length<minItems)throw new InputValidationError(`${field} must contain at least ${minItems} distinct entries`);return unique}export function parseObjectInput(value,field){if(!value||typeof value!=="object"||Array.isArray(value)||![Object.prototype,null].includes(Object.getPrototypeOf(value)))throw new InputValidationError(`${field} must be a JSON object`);return value}export function parseArrayInput(value,field,minItems=0,maxItems=100){if(!Number.isSafeInteger(minItems)||!Number.isSafeInteger(maxItems)||minItems<0||maxItems<minItems)throw RangeError("Invalid array bounds");if(!Array.isArray(value)||value.length<minItems||value.length>maxItems)throw new InputValidationError(`${field} must contain ${minItems} to ${maxItems} entries`);return value}export function parsePositiveIdListInput(value,field,minItems=1,maxItems=100){const items=parseArrayInput(value,field,minItems,maxItems);let ids;try{ids=Array.from(items,parsePositiveId)}catch(error){if(error instanceof InputValidationError)throw new InputValidationError(`${field} contains an invalid identifier`);throw error}const unique=[...new Set(ids)];if(unique.length<minItems)throw new InputValidationError(`${field} must contain at least ${minItems} distinct entries`);return unique}export function storedBoolean(value,fallback){if(value==null)return fallback;try{return parseBooleanInput(value,"Stored value")??fallback}catch(error){if(error instanceof InputValidationError)return fallback;throw error}}export function positiveIdOrNull(value){try{return parsePositiveId(value)}catch(error){if(error instanceof InputValidationError)return null;throw error}}
1
+ import{applyConditionals}from"./conditional";export class InputValidationError extends Error{status=422}export async function readJsonObject(request){let body;try{body=await request.json()}catch{throw new InputValidationError("Send a valid JSON object")}if(!body||typeof body!=="object"||Array.isArray(body))throw new InputValidationError("Send a JSON object");return body}export function parsePositiveId(value){if(typeof value!=="string"&&typeof value!=="number")throw new InputValidationError("Invalid identifier");if(typeof value==="string"&&!/^\d+$/.test(value.trim()))throw new InputValidationError("Invalid identifier");const id=Number(value);if(!Number.isSafeInteger(id)||id<=0)throw new InputValidationError("Invalid identifier");return id}export function parseTextInput(value,field,required=false,maxLength){if(maxLength!==undefined&&(!Number.isSafeInteger(maxLength)||maxLength<0))throw new RangeError("Text length must be a non-negative safe integer");if(value==null&&!required)return null;if(typeof value!=="string")throw new InputValidationError(`${field} must be text`);const text=value.trim();if(maxLength!==undefined&&[...text].length>maxLength)throw new InputValidationError(`${field} is too long`);if(!text&&required)throw new InputValidationError(`${field} is required`);return text||null}export function parseNumberInput(value,field,min,max,integer=false){if(typeof min!=="number"||typeof max!=="number"||Number.isNaN(min)||Number.isNaN(max)||min>max||min===1/0||max===-1/0)throw new RangeError("Invalid numeric bounds");if(value==null||value==="")return null;if(typeof value!=="number"&&typeof value!=="string"||typeof value==="string"&&!/^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i.test(value.trim()))throw new InputValidationError(`${field} must be a number`);const number=Number(value);if(!Number.isFinite(number)||number<min||number>max||Number.isInteger(number)&&!Number.isSafeInteger(number)||integer&&!Number.isInteger(number))throw new InputValidationError(`${field} is out of range`);return number}export function parseBooleanInput(value,field){if(value===undefined)return;if(value===true||value==="true"||value===1||value==="1"||value==="on")return true;if(value===false||value==="false"||value===0||value==="0"||value==="off")return false;throw new InputValidationError(`${field} must be a boolean`)}export function validateModelInput(model,values){const attributes=model.getDefinition().attributes??{};const context=Object.assign(Object.create(null),values);for(const field of Object.keys(attributes)){const column=field.replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/([A-Z])([A-Z][a-z])/g,"$1_$2").toLowerCase();if(Object.hasOwn(values,field)||Object.hasOwn(values,column)){context[field]=context[column]=Object.hasOwn(values,field)?values[field]:values[column]}}for(const[field,value]of Object.entries(values)){const attribute=Object.prototype.hasOwnProperty.call(attributes,field)?field:Object.keys(attributes).find((key)=>key===field||key.replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/([A-Z])([A-Z][a-z])/g,"$1_$2").toLowerCase()===field);const rule=attribute?attributes[attribute]?.validation?.rule:undefined;if(rule&&!applyConditionals(rule,context).validate(value).valid)throw new InputValidationError(`Invalid ${field.replaceAll("_"," ")}`)}}export function isEnumInput(value,choices){return typeof value==="string"&&choices.includes(value)}export function parseEnumInput(value,field,choices){if(!isEnumInput(value,choices))throw new InputValidationError(`${field} must be ${choices.join(", ")}`);return value}export function parseEnumListInput(value,field,choices,minItems=1,maxItems=100){if(!Number.isSafeInteger(minItems)||!Number.isSafeInteger(maxItems)||minItems<0||maxItems<minItems)throw new RangeError("Invalid enum list bounds");if(!Array.isArray(value)||value.length<minItems||value.length>maxItems)throw new InputValidationError(`${field} must contain ${minItems} to ${maxItems} entries`);const unique=[...new Set(Array.from(value,(item)=>parseEnumInput(item,field,choices)))];if(unique.length<minItems)throw new InputValidationError(`${field} must contain at least ${minItems} distinct entries`);return unique}export function parseObjectInput(value,field){if(!value||typeof value!=="object"||Array.isArray(value)||![Object.prototype,null].includes(Object.getPrototypeOf(value)))throw new InputValidationError(`${field} must be a JSON object`);return value}export function parseArrayInput(value,field,minItems=0,maxItems=100){if(!Number.isSafeInteger(minItems)||!Number.isSafeInteger(maxItems)||minItems<0||maxItems<minItems)throw new RangeError("Invalid array bounds");if(!Array.isArray(value)||value.length<minItems||value.length>maxItems)throw new InputValidationError(`${field} must contain ${minItems} to ${maxItems} entries`);return value}export function parsePositiveIdListInput(value,field,minItems=1,maxItems=100){const items=parseArrayInput(value,field,minItems,maxItems);let ids;try{ids=Array.from(items,parsePositiveId)}catch(error){if(error instanceof InputValidationError)throw new InputValidationError(`${field} contains an invalid identifier`);throw error}const unique=[...new Set(ids)];if(unique.length<minItems)throw new InputValidationError(`${field} must contain at least ${minItems} distinct entries`);return unique}export function storedBoolean(value,fallback){if(value==null)return fallback;try{return parseBooleanInput(value,"Stored value")??fallback}catch(error){if(error instanceof InputValidationError)return fallback;throw error}}export function positiveIdOrNull(value){try{return parsePositiveId(value)}catch(error){if(error instanceof InputValidationError)return null;throw error}}
package/dist/is.js CHANGED
@@ -1 +1 @@
1
- import{toString}from"@stacksjs/strings";import{getTypeName}from"@stacksjs/types";export function isDef(val){return typeof val<"u"}export function isBoolean(val){return typeof val==="boolean"}export function isFunction(val){return typeof val==="function"}export function isNumber(val){return typeof val==="number"}export function isString(val){return typeof val==="string"}export function isObject(val){return toString(val)==="[object Object]"}export function isWindow(val){return typeof window<"u"&&toString(val)==="[object Window]"}export const isBrowser=typeof window<"u",isServer=typeof document>"u";export function isMap(val){return toString(val)==="[object Map]"}export function isSet(val){return toString(val)==="[object Set]"}export function isPromise(val){return toString(val)==="[object Promise]"}export function isUndefined(v){return getTypeName(v)==="undefined"}export function isNull(v){return getTypeName(v)==="null"}export function isSymbol(v){return getTypeName(v)==="symbol"}export function isDate(v){return getTypeName(v)==="date"}export function isRegExp(v){return getTypeName(v)==="regexp"}export function isArray(v){return getTypeName(v)==="array"}export function isPrimitive(v){const type=getTypeName(v);return type==="null"||type==="undefined"||type==="string"||type==="number"||type==="boolean"||type==="symbol"}export function isInteger(v){return isNumber(v)&&Number.isInteger(v)}export function isFloat(v){return isNumber(v)&&!Number.isInteger(v)}export function isPositive(v){return isNumber(v)&&v>0}export function isNegative(v){return isNumber(v)&&v<0}export function isEven(v){return isNumber(v)&&v%2===0}export function isOdd(v){return isNumber(v)&&v%2!==0}export function isEvenOrOdd(v){return isNumber(v)?v%2===0?"even":"odd":"odd"}export function isPositiveOrNegative(v){return isNumber(v)?v>0?"positive":"negative":"negative"}export function isIntegerOrFloat(v){return isNumber(v)?Number.isInteger(v)?"integer":"float":"float"}
1
+ import{toString}from"@stacksjs/strings";import{getTypeName}from"@stacksjs/types";export function isDef(val){return typeof val!=="undefined"}export function isBoolean(val){return typeof val==="boolean"}export function isFunction(val){return typeof val==="function"}export function isNumber(val){return typeof val==="number"}export function isString(val){return typeof val==="string"}export function isObject(val){return toString(val)==="[object Object]"}export function isWindow(val){return typeof window!=="undefined"&&toString(val)==="[object Window]"}export const isBrowser=typeof window!=="undefined";export const isServer=typeof document==="undefined";export function isMap(val){return toString(val)==="[object Map]"}export function isSet(val){return toString(val)==="[object Set]"}export function isPromise(val){return toString(val)==="[object Promise]"}export function isUndefined(v){return getTypeName(v)==="undefined"}export function isNull(v){return getTypeName(v)==="null"}export function isSymbol(v){return getTypeName(v)==="symbol"}export function isDate(v){return getTypeName(v)==="date"}export function isRegExp(v){return getTypeName(v)==="regexp"}export function isArray(v){return getTypeName(v)==="array"}export function isPrimitive(v){const type=getTypeName(v);return type==="null"||type==="undefined"||type==="string"||type==="number"||type==="boolean"||type==="symbol"}export function isInteger(v){return isNumber(v)&&Number.isInteger(v)}export function isFloat(v){return isNumber(v)&&!Number.isInteger(v)}export function isPositive(v){return isNumber(v)&&v>0}export function isNegative(v){return isNumber(v)&&v<0}export function isEven(v){return isNumber(v)&&v%2===0}export function isOdd(v){return isNumber(v)&&v%2!==0}export function isEvenOrOdd(v){return isNumber(v)?v%2===0?"even":"odd":"odd"}export function isPositiveOrNegative(v){return isNumber(v)?v>0?"positive":"negative":"negative"}export function isIntegerOrFloat(v){return isNumber(v)?Number.isInteger(v)?"integer":"float":"float"}
package/dist/messages.js CHANGED
@@ -1 +1 @@
1
- var {require}=import.meta;function keyFor(validator,name,index){return name==="custom"&&index===0&&typeof validator.name==="string"&&validator.name!=="custom"?validator.name:name}export function messageKeys(rule){const validator=rule;if(!validator||typeof validator.getRules!=="function")return new Set;const names=new Set(validator.getRules().map((entry,index)=>keyFor(validator,entry?.name,index)).filter((name)=>typeof name==="string"));if(validator.isRequired)names.add("required");return names}const failureKey=Symbol.for("stacks.validation.failureNames"),failureNames=globalThis[failureKey]??=new WeakMap;export function validationFailure(message,name){const error={message};failureNames.set(error,name);return error}function namesFromErrors(rule,value,errors){const{getCustomMessages}=require("@stacksjs/ts-validation"),provider=getCustomMessages();if(rule.isRequired&&(value===void 0||value===null||value==="")){const message=provider.getMessage("required",void 0,rule.fieldName);return errors.map((error)=>error.message===message?"required":void 0)}const candidates=(rule.getRules?.()??[]).map((entry,index)=>({key:keyFor(rule,entry.name,index),message:entry.name?provider.getMessage(entry.name,entry.message,rule.fieldName,entry.params):entry.message}));return errors.map((error)=>{const names=new Set(candidates.filter((candidate)=>candidate.message===error.message).map((candidate)=>candidate.key));return names.size===1?[...names][0]:void 0})}export function validateRule(rule,value){const validator=rule,result=validator.validate(value);if(result.valid)return result;const errors=Array.isArray(result.errors)?result.errors:Object.values(result.errors).flat();if(Array.isArray(result.errors)||validator.isRequired&&(value===void 0||value===null||value==="")){const names=namesFromErrors(validator,value,errors);errors.forEach((error,index)=>{if(!failureNames.has(error))failureNames.set(error,names[index])})}return result}export function applyFieldMessages(errors,rules,messages,input){for(const[field,message]of Object.entries(messages))for(const key of Object.keys(errors)){if(key!==field&&!key.startsWith(`${field}.`))continue;if(key!==field&&typeof message!=="string")continue;errors[key]=fieldErrorMessages(rules[field],input[field],errors[key],message,field).map((text)=>({message:text}))}}export function fieldErrorMessages(rule,value,errors,messages,field,format=(message)=>message){if(typeof messages==="string")return[messages];if(!messages||typeof messages!=="object")return errors.map((error)=>format(error.message));const fallback=errors.some((error)=>!failureNames.has(error))?namesFromErrors(rule??{},value,errors):[],names=errors.map((error,index)=>failureNames.has(error)?failureNames.get(error):fallback[index]),custom=(key)=>{if(key===void 0||!Object.hasOwn(messages,key))return;const message=messages[key];return typeof message==="string"&&message!==""?message:void 0},fieldWide=messageKeys(rule).has(field)?void 0:custom(field);return[...new Set(errors.map((error,index)=>custom(names[index])??fieldWide??format(error.message)))]}
1
+ function keyFor(validator,name,index){return name==="custom"&&index===0&&typeof validator.name==="string"&&validator.name!=="custom"?validator.name:name}export function messageKeys(rule){const validator=rule;if(!validator||typeof validator.getRules!=="function")return new Set;const names=new Set(validator.getRules().map((entry,index)=>keyFor(validator,entry?.name,index)).filter((name)=>typeof name==="string"));if(validator.isRequired)names.add("required");return names}const failureKey=Symbol.for("stacks.validation.failureNames");const failureNames=globalThis[failureKey]??=new WeakMap;export function validationFailure(message,name){const error={message};failureNames.set(error,name);return error}function namesFromErrors(rule,value,errors){const{getCustomMessages}=require("@stacksjs/ts-validation");const provider=getCustomMessages();if(rule.isRequired&&(value===undefined||value===null||value==="")){const message=provider.getMessage("required",undefined,rule.fieldName);return errors.map((error)=>error.message===message?"required":undefined)}const candidates=(rule.getRules?.()??[]).map((entry,index)=>({key:keyFor(rule,entry.name,index),message:entry.name?provider.getMessage(entry.name,entry.message,rule.fieldName,entry.params):entry.message}));return errors.map((error)=>{const names=new Set(candidates.filter((candidate)=>candidate.message===error.message).map((candidate)=>candidate.key));return names.size===1?[...names][0]:undefined})}export function validateRule(rule,value){const validator=rule;const result=validator.validate(value);if(result.valid)return result;const errors=Array.isArray(result.errors)?result.errors:Object.values(result.errors).flat();if(Array.isArray(result.errors)||validator.isRequired&&(value===undefined||value===null||value==="")){const names=namesFromErrors(validator,value,errors);errors.forEach((error,index)=>{if(!failureNames.has(error))failureNames.set(error,names[index])})}return result}export function applyFieldMessages(errors,rules,messages,input){for(const[field,message]of Object.entries(messages)){for(const key of Object.keys(errors)){if(key!==field&&!key.startsWith(`${field}.`))continue;if(key!==field&&typeof message!=="string")continue;errors[key]=fieldErrorMessages(rules[field],input[field],errors[key],message,field).map((text)=>({message:text}))}}}export function fieldErrorMessages(rule,value,errors,messages,field,format=(message)=>message){if(typeof messages==="string")return[messages];if(!messages||typeof messages!=="object")return errors.map((error)=>format(error.message));const fallback=errors.some((error)=>!failureNames.has(error))?namesFromErrors(rule??{},value,errors):[];const names=errors.map((error,index)=>failureNames.has(error)?failureNames.get(error):fallback[index]);const custom=(key)=>{if(key===undefined||!Object.hasOwn(messages,key))return;const message=messages[key];return typeof message==="string"&&message!==""?message:undefined};const fieldWide=messageKeys(rule).has(field)?undefined:custom(field);return[...new Set(errors.map((error,index)=>custom(names[index])??fieldWide??format(error.message)))]}
@@ -1 +1 @@
1
- import{rememberValidatedValue}from"./validated-value";import{validationFailure,validateRule}from"./messages";import{applyConditionals,withConditionals}from"./conditional";export function objectWithContext(initialShape){return withConditionals({name:"object",isRequired:!0,schema:initialShape??{},getRules:()=>[],test(value){return this.validate(value).valid},isPartOfShape:!1,shape(next){this.schema=next;return this},getShape(){return this.schema},required(){this.isRequired=!0;return this},optional(){this.isRequired=!1;return this},validate(value){const isEmpty=value===void 0||value===null;if(!this.isRequired&&isEmpty)return{valid:!0,errors:this.isPartOfShape?{}:[]};if(this.isRequired&&isEmpty){const error=validationFailure("value is required","required");return this.isPartOfShape?{valid:!1,errors:{object:[error]}}:{valid:!1,errors:[error]}}if(typeof value!=="object"||Array.isArray(value)){const message="Must be an object";return this.isPartOfShape?{valid:!1,errors:{object:[{message}]}}:{valid:!1,errors:[{message}]}}const parent=value,errors=Object.create(null),cleaned=[];let hasErrors=!1;for(const key of Object.keys(this.schema)){const baseChild=this.schema[key];if(!baseChild)continue;const child=applyConditionals(baseChild,parent),fieldValue=Object.hasOwn(parent,key)?parent[key]:void 0,result=validateRule(child,fieldValue);if(result.valid){if(Object.hasOwn(parent,key))cleaned.push([key,"value"in result?result.value:fieldValue]);continue}hasErrors=!0;if(!Array.isArray(result.errors))for(const[nestedKey,nestedErrors]of Object.entries(result.errors))errors[`${key}.${nestedKey}`]=nestedErrors;else errors[key]=result.errors}if(hasErrors)return{valid:!1,errors};const projected=Object.fromEntries(cleaned);rememberValidatedValue(this,parent,projected);return{valid:!0,errors:{},value:projected}}})}
1
+ import{rememberValidatedValue}from"./validated-value";import{validationFailure,validateRule}from"./messages";import{applyConditionals,withConditionals}from"./conditional";export function objectWithContext(initialShape){const validator={name:"object",isRequired:true,schema:initialShape??{},getRules:()=>[],test(value){return this.validate(value).valid},isPartOfShape:false,shape(next){this.schema=next;return this},getShape(){return this.schema},required(){this.isRequired=true;return this},optional(){this.isRequired=false;return this},validate(value){const isEmpty=value===undefined||value===null;if(!this.isRequired&&isEmpty){return{valid:true,errors:this.isPartOfShape?{}:[]}}if(this.isRequired&&isEmpty){const error=validationFailure("value is required","required");return this.isPartOfShape?{valid:false,errors:{object:[error]}}:{valid:false,errors:[error]}}if(typeof value!=="object"||Array.isArray(value)){const message="Must be an object";return this.isPartOfShape?{valid:false,errors:{object:[{message}]}}:{valid:false,errors:[{message}]}}const parent=value;const errors=Object.create(null);const cleaned=[];let hasErrors=false;for(const key of Object.keys(this.schema)){const baseChild=this.schema[key];if(!baseChild)continue;const child=applyConditionals(baseChild,parent);const fieldValue=Object.hasOwn(parent,key)?parent[key]:undefined;const result=validateRule(child,fieldValue);if(result.valid){if(Object.hasOwn(parent,key))cleaned.push([key,"value"in result?result.value:fieldValue]);continue}hasErrors=true;const isMap=!Array.isArray(result.errors);if(isMap){for(const[nestedKey,nestedErrors]of Object.entries(result.errors)){errors[`${key}.${nestedKey}`]=nestedErrors}}else{errors[key]=result.errors}}if(hasErrors)return{valid:false,errors};const projected=Object.fromEntries(cleaned);rememberValidatedValue(this,parent,projected);return{valid:true,errors:{},value:projected}}};const augmented=withConditionals(validator);return augmented}
package/dist/reporter.js CHANGED
@@ -1 +1 @@
1
- import{AsyncLocalStorage}from"node:async_hooks";const key=Symbol.for("stacks.validation.reportStorage"),reports=globalThis[key]??=new AsyncLocalStorage;export function beginValidation(){reports.enterWith({messages:[]})}export function withValidationContext(run){return reports.run({messages:[]},run)}export function reportError(errors){if(!reports.getStore())beginValidation();reports.getStore().messages=errors.map((error)=>({...error}))}export function getErrors(){return reports.getStore()?.messages.map((error)=>({...error}))??[]}
1
+ import{AsyncLocalStorage}from"node:async_hooks";const key=Symbol.for("stacks.validation.reportStorage");const reports=globalThis[key]??=new AsyncLocalStorage;export function beginValidation(){reports.enterWith({messages:[]})}export function withValidationContext(run){return reports.run({messages:[]},run)}export function reportError(errors){if(!reports.getStore())beginValidation();reports.getStore().messages=errors.map((error)=>({...error}))}export function getErrors(){return reports.getStore()?.messages.map((error)=>({...error}))??[]}
@@ -1 +1 @@
1
- import{HttpError}from"@stacksjs/error-handling/http-error";import{applyFieldMessages}from"./messages";import{objectWithContext}from"./object-with-context";import{beginValidation}from"./reporter";async function gatherRequestInput(source,options){if(!source||typeof source!=="object")throw new HttpError(422,"Send an input object");if(options.source!=="data"&&typeof source.all==="function")return await source.all();const native=options.source!=="data"&&source instanceof Request,adapter=options.source==="request"||options.source!=="data"&&(Object.hasOwn(source,"jsonBody")||Object.hasOwn(source,"formBody"));if(!native&&!adapter)return source;const request=source,input=Object.create(null);if(request.url)try{new URL(request.url).searchParams.forEach((value,key)=>{input[key]=value})}catch{throw new HttpError(422,"Invalid request URL")}if(native&&!["GET","HEAD"].includes(source.method)&&source.body!==null){const type=source.headers.get("content-type")?.split(";")[0]?.trim().toLowerCase();try{if(type==="application/json"||type?.endsWith("+json")){const body=await source.json();if(!body||typeof body!=="object"||Array.isArray(body))throw Error("Not an object");Object.assign(input,body)}else if(type==="application/x-www-form-urlencoded"||type==="multipart/form-data")for(const[key,value]of await source.formData())input[key]=value;else throw Error("Unsupported media type")}catch{throw new HttpError(422,"Send a valid request body")}}for(const values of[request.query,request.jsonBody,request.formBody,request.params])if(values&&typeof values==="object")Object.assign(input,values);return input}export async function validate(request,rules,options={}){beginValidation();const input=await gatherRequestInput(request,options);if(!input||typeof input!=="object"||Array.isArray(input))throw new HttpError(422,"Send an input object");const ruleObject=Object.create(null),messages=Object.create(null);for(const[field,definition]of Object.entries(rules)){if(!definition)continue;if("rule"in definition){ruleObject[field]=definition.rule;if(definition.message)messages[field]=definition.message}else ruleObject[field]=definition}const result=objectWithContext(ruleObject).validate(input);if(!result.valid){const errors=result.errors;applyFieldMessages(errors,ruleObject,messages,input);throw new HttpError(422,"Validation failed",{errors:Object.fromEntries(Object.entries(errors).map(([field,entries])=>[field,entries.map((error)=>error.message)]))})}return result.value}
1
+ import{HttpError}from"@stacksjs/error-handling/http-error";import{applyFieldMessages}from"./messages";import{objectWithContext}from"./object-with-context";import{beginValidation}from"./reporter";async function gatherRequestInput(source,options){if(!source||typeof source!=="object")throw new HttpError(422,"Send an input object");if(options.source!=="data"&&typeof source.all==="function")return await source.all();const native=options.source!=="data"&&source instanceof Request;const adapter=options.source==="request"||options.source!=="data"&&(Object.hasOwn(source,"jsonBody")||Object.hasOwn(source,"formBody"));if(!native&&!adapter)return source;const request=source;const input=Object.create(null);if(request.url){try{new URL(request.url).searchParams.forEach((value,key)=>{input[key]=value})}catch{throw new HttpError(422,"Invalid request URL")}}if(native&&!["GET","HEAD"].includes(source.method)&&source.body!==null){const type=source.headers.get("content-type")?.split(";")[0]?.trim().toLowerCase();try{if(type==="application/json"||type?.endsWith("+json")){const body=await source.json();if(!body||typeof body!=="object"||Array.isArray(body))throw new Error("Not an object");Object.assign(input,body)}else if(type==="application/x-www-form-urlencoded"||type==="multipart/form-data"){for(const[key,value]of await source.formData())input[key]=value}else throw new Error("Unsupported media type")}catch{throw new HttpError(422,"Send a valid request body")}}for(const values of[request.query,request.jsonBody,request.formBody,request.params]){if(values&&typeof values==="object")Object.assign(input,values)}return input}export async function validate(request,rules,options={}){beginValidation();const input=await gatherRequestInput(request,options);if(!input||typeof input!=="object"||Array.isArray(input))throw new HttpError(422,"Send an input object");const ruleObject=Object.create(null);const messages=Object.create(null);for(const[field,definition]of Object.entries(rules)){if(!definition)continue;if("rule"in definition){ruleObject[field]=definition.rule;if(definition.message)messages[field]=definition.message}else ruleObject[field]=definition}const result=objectWithContext(ruleObject).validate(input);if(!result.valid){const errors=result.errors;applyFieldMessages(errors,ruleObject,messages,input);throw new HttpError(422,"Validation failed",{errors:Object.fromEntries(Object.entries(errors).map(([field,entries])=>[field,entries.map((error)=>error.message)]))})}return result.value}
package/dist/schema.js CHANGED
@@ -1 +1 @@
1
- import{v}from"@stacksjs/ts-validation";import{rememberValidatedValue,validatedValue}from"./validated-value";import{file,FileValidator}from"./file-validator";import{withConditionals}from"./conditional";import{objectWithContext}from"./object-with-context";const FACTORY_KEYS=new Set(["array","bigint","binary","blob","boolean","custom","date","datetime","decimal","double","enum","float","integer","json","number","password","smallint","string","text","time","timestamp","timestampTz","unix"]);function isValidDateInput(value){if(value instanceof Date)return!Number.isNaN(value.getTime());if(typeof value!=="string"||!/^\d{4}-\d{2}-\d{2}$/.test(value))return!1;const parsed=new Date(`${value}T00:00:00.000Z`);return!Number.isNaN(parsed.getTime())&&parsed.toISOString().slice(0,10)===value}function dateInputFactory(){const validator=v.custom(isValidDateInput,"Must be a valid date");validator.name="date";return withConditionals(validator)}function isValidTimestampInput(value){if(value instanceof Date)return!Number.isNaN(value.getTime());if(typeof value==="number")return Number.isFinite(value)&&value>=0&&!Number.isNaN(new Date(value).getTime());if(typeof value!=="string")return!1;const trimmed=value.trim();if(!trimmed)return!1;if(/^\d+$/.test(trimmed))return isValidTimestampInput(Number(trimmed));const parts=/^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(?:Z|[+-]\d{2}:?\d{2})?)?$/i.exec(trimmed);if(!parts)return!1;const calendar=new Date(`${parts[1]}-${parts[2]}-${parts[3]}T00:00:00.000Z`);if(!Number.isFinite(calendar.getTime())||calendar.getUTCFullYear()!==Number(parts[1])||calendar.getUTCMonth()+1!==Number(parts[2])||calendar.getUTCDate()!==Number(parts[3]))return!1;if(parts[4]!==void 0){const hour=Number(parts[4]),minute=Number(parts[5]),second=Number(parts[6]??0);if(hour>24||minute>59||second>59)return!1;if(hour===24&&(minute!==0||second!==0||/[1-9]/.test(parts[7]??"")))return!1}return!Number.isNaN(new Date(trimmed.replace(" ","T")).getTime())}function timestampInputFactory(){const validator=v.custom(isValidTimestampInput,"Must be a valid timestamp");validator.name="timestamp";return withConditionals(validator)}const elementRule=Symbol.for("stacks.validation.arrayElement");function projectArray(validator){const array=validator,{each,validate}=array;array.each=function(rule){this[elementRule]=rule;return each.call(this,rule)};array.validate=function(input){const result=validate.call(this,input),child=this[elementRule];if(result.valid&&child&&Array.isArray(input)){const value=input.map((item)=>validatedValue(child,item));rememberValidatedValue(this,input,value);return{...result,value}}return result};return array}const wrappedFactories=Object.create(null);export const schema=new Proxy(v,{get(target,prop,receiver){if(prop==="file")return file;if(prop==="object")return objectWithContext;if(prop==="date")return dateInputFactory;if(prop==="timestamp")return timestampInputFactory;if(typeof prop==="string"){const cached=wrappedFactories[prop];if(cached)return cached;if(!FACTORY_KEYS.has(prop))return Reflect.get(target,prop,receiver);const wrapped=(...args)=>{const validator=Reflect.get(target,prop,receiver)(...args);return withConditionals(prop==="array"?projectArray(validator):validator)};wrappedFactories[prop]=wrapped;return wrapped}return Reflect.get(target,prop,receiver)}});export{file,FileValidator}from"./file-validator";export{applyConditionals,shouldApplyConditional,withConditionals}from"./conditional";export{objectWithContext}from"./object-with-context";
1
+ import{v}from"@stacksjs/ts-validation";import{rememberValidatedValue,validatedValue}from"./validated-value";import{file,FileValidator}from"./file-validator";import{withConditionals}from"./conditional";import{objectWithContext}from"./object-with-context";const FACTORY_KEYS=new Set(["array","bigint","binary","blob","boolean","custom","date","datetime","decimal","double","enum","float","integer","json","number","password","smallint","string","text","time","timestamp","timestampTz","unix"]);function isValidDateInput(value){if(value instanceof Date)return!Number.isNaN(value.getTime());if(typeof value!=="string"||!/^\d{4}-\d{2}-\d{2}$/.test(value))return false;const parsed=new Date(`${value}T00:00:00.000Z`);return!Number.isNaN(parsed.getTime())&&parsed.toISOString().slice(0,10)===value}function dateInputFactory(){const validator=v.custom(isValidDateInput,"Must be a valid date");validator.name="date";return withConditionals(validator)}function isValidTimestampInput(value){if(value instanceof Date)return!Number.isNaN(value.getTime());if(typeof value==="number")return Number.isFinite(value)&&value>=0&&!Number.isNaN(new Date(value).getTime());if(typeof value!=="string")return false;const trimmed=value.trim();if(!trimmed)return false;if(/^\d+$/.test(trimmed))return isValidTimestampInput(Number(trimmed));const parts=/^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(?:Z|[+-]\d{2}:?\d{2})?)?$/i.exec(trimmed);if(!parts)return false;const calendar=new Date(`${parts[1]}-${parts[2]}-${parts[3]}T00:00:00.000Z`);if(!Number.isFinite(calendar.getTime())||calendar.getUTCFullYear()!==Number(parts[1])||calendar.getUTCMonth()+1!==Number(parts[2])||calendar.getUTCDate()!==Number(parts[3]))return false;if(parts[4]!==undefined){const hour=Number(parts[4]),minute=Number(parts[5]),second=Number(parts[6]??0);if(hour>24||minute>59||second>59)return false;if(hour===24&&(minute!==0||second!==0||/[1-9]/.test(parts[7]??"")))return false}return!Number.isNaN(new Date(trimmed.replace(" ","T")).getTime())}function timestampInputFactory(){const validator=v.custom(isValidTimestampInput,"Must be a valid timestamp");validator.name="timestamp";return withConditionals(validator)}const elementRule=Symbol.for("stacks.validation.arrayElement");function projectArray(validator){const array=validator;const each=array.each;const validate=array.validate;array.each=function(rule){this[elementRule]=rule;return each.call(this,rule)};array.validate=function(input){const result=validate.call(this,input);const child=this[elementRule];if(result.valid&&child&&Array.isArray(input)){const value=input.map((item)=>validatedValue(child,item));rememberValidatedValue(this,input,value);return{...result,value}}return result};return array}const wrappedFactories=Object.create(null);export const schema=new Proxy(v,{get(target,prop,receiver){if(prop==="file")return file;if(prop==="object")return objectWithContext;if(prop==="date")return dateInputFactory;if(prop==="timestamp")return timestampInputFactory;if(typeof prop==="string"){const cached=wrappedFactories[prop];if(cached)return cached;if(!FACTORY_KEYS.has(prop))return Reflect.get(target,prop,receiver);const wrapped=(...args)=>{const factory=Reflect.get(target,prop,receiver);const validator=factory(...args);return withConditionals(prop==="array"?projectArray(validator):validator)};wrappedFactories[prop]=wrapped;return wrapped}return Reflect.get(target,prop,receiver)}});export{file,FileValidator}from"./file-validator";export{applyConditionals,shouldApplyConditional,withConditionals}from"./conditional";export{objectWithContext}from"./object-with-context";
@@ -1 +1 @@
1
- const key=Symbol.for("stacks.validation.projectedValues"),values=globalThis[key]??=new WeakMap;export function rememberValidatedValue(rule,input,value){if(!input||typeof input!=="object")return;let entries=values.get(rule);if(!entries)values.set(rule,entries=new WeakMap);entries.set(input,value)}export function validatedValue(rule,input){if(!input||typeof input!=="object")return input;const entries=values.get(rule);return entries?.has(input)?entries.get(input):input}
1
+ const key=Symbol.for("stacks.validation.projectedValues");const values=globalThis[key]??=new WeakMap;export function rememberValidatedValue(rule,input,value){if(!input||typeof input!=="object")return;let entries=values.get(rule);if(!entries)values.set(rule,entries=new WeakMap);entries.set(input,value)}export function validatedValue(rule,input){if(!input||typeof input!=="object")return input;const entries=values.get(rule);return entries?.has(input)?entries.get(input):input}
package/dist/validator.js CHANGED
@@ -1 +1 @@
1
- import{basename,relative}from"node:path";import{existsSync}from"node:fs";import{HttpError}from"@stacksjs/error-handling/http-error";import{path}from"@stacksjs/path";import{snakeCase}from"@stacksjs/strings/case";import{getErrorMessage}from"@stacksjs/utils/errors";import{applyFieldMessages}from"./messages";import{beginValidation,reportError}from"./reporter";import{schema}from"./schema";export{validate}from"./request-validator";function globSync(patterns,options={}){const results=[];for(const pattern of patterns){const slash=pattern.startsWith("/")?pattern.lastIndexOf("/"):-1,wildcardAt=pattern.indexOf("*"),splitAt=wildcardAt===-1?slash:pattern.lastIndexOf("/",wildcardAt),cwd=splitAt>0?pattern.slice(0,splitAt):".",rel=splitAt>0?pattern.slice(splitAt+1):pattern;if(!existsSync(cwd))continue;const glob=new Bun.Glob(rel);for(const match of glob.scanSync({cwd,onlyFiles:!0}))results.push(options.absolute?`${cwd}/${match}`:match)}return results}export function isObjectNotEmpty(obj){if(obj===void 0)return!1;return Object.keys(obj).length>0}function toMessageObjects(errors,params){const valueFor=(field)=>{const value=params[field];return value===void 0||value===null?"":String(value)};if(Array.isArray(errors))return errors.map((error)=>({message:error.message,value:"",field:""}));return Object.entries(errors).flatMap(([field,fieldErrors])=>fieldErrors.map((error)=>({message:error.message,value:valueFor(field),field})))}export async function validateField(modelFile,params){beginValidation();const name=modelFile.replace(/\\/g,"/").replace(/\.ts$/,"");if(!name||name.startsWith("/")||name.split("/").some((segment)=>!segment||segment==="."||segment===".."))throw new HttpError(404,"Model not found");const files=new Map;for(const root of[path.userModelsPath(),path.defaultsPath("app/Models")])for(const file of globSync([`${root}/**/*.ts`],{absolute:!0})){const key=relative(root,file).replace(/\\/g,"/");if(!files.has(key))files.set(key,file)}const exact=files.get(`${name}.ts`),matches=exact?[exact]:name.includes("/")?[]:[...files.values()].filter((file)=>basename(file)===`${name}.ts`);if(matches.length>1)throw new HttpError(500,`Model ${name} is ambiguous; use its qualified path`);const modelPath=matches[0];if(!modelPath)throw new HttpError(404,`Model ${name} not found`);const attributes=(await import(modelPath)).default.attributes,input=Object.assign(Object.create(null),params),ruleObject=Object.create(null),messages=Object.create(null);for(const key in attributes)if(Object.prototype.hasOwnProperty.call(attributes,key)){const attributeKey=attributes[key];if(!attributeKey)continue;const isRequired="isRequired"in(attributeKey.validation?.rule??{})?(attributeKey.validation?.rule).isRequired:!1,field=snakeCase(key);if(Object.hasOwn(params,key))input[field]=params[key];if(Object.hasOwn(input,field))input[key]=input[field];if(attributeKey.default!==void 0&&isRequired===!1&&!Object.hasOwn(input,field))continue;ruleObject[snakeCase(key)]=attributeKey.validation?.rule;const validatorMessages=attributeKey.validation?.message;if(validatorMessages)messages[snakeCase(key)]=validatorMessages}try{const result=await schema.object(ruleObject).validate(input);applyMessages(result,ruleObject,messages,input);if(!result.valid){reportError(toMessageObjects(result.errors,input));throw new HttpError(422,"Validation failed",{errors:result.errors})}return result}catch(error){if(isHttpErrorLike(error))throw error;throw new HttpError(500,getErrorMessage(error)||"An unexpected validation error occurred")}}const customRuleRegistry=new Map;export function registerRule(name,rule){customRuleRegistry.set(name,rule)}export function getCustomRule(name){return customRuleRegistry.get(name)}export function unique(table,column,exceptId){return async(value)=>{const{db}=await import("@stacksjs/database/runtime");let query=db.selectFrom(table).where(column,"=",value);if(exceptId!==void 0)query=query.where("id","!=",exceptId);return await query.selectAll().executeTakeFirst()?`The ${column} has already been taken`:!0}}export function exists(table,column){return async(value)=>{const{db}=await import("@stacksjs/database/runtime");return await db.selectFrom(table).where(column,"=",value).selectAll().executeTakeFirst()?!0:`The selected ${column} does not exist`}}export async function validateFieldAsync(modelFile,params,asyncRules){const syncResult=await validateField(modelFile,params);if(asyncRules&&Object.keys(asyncRules).length>0){const asyncErrors=Object.create(null);await Promise.all(Object.entries(asyncRules).map(async([field,validator])=>{const result=await validator(params[field],params);if(result!==!0)asyncErrors[field]=typeof result==="string"?result:`${field} validation failed`}));if(Object.keys(asyncErrors).length>0){reportError(Object.entries(asyncErrors).map(([field,message])=>({field,message,value:String(params[field]??"")})));throw new HttpError(422,"Validation failed",{errors:asyncErrors})}}return syncResult}export async function customValidate(attributes,params){beginValidation();const ruleObject=Object.create(null),messages=Object.create(null);for(const key in attributes)if(Object.prototype.hasOwnProperty.call(attributes,key)){const rule=attributes[key]?.rule;if(rule)ruleObject[key]=rule;const validatorMessages=attributes[key]?.message;if(validatorMessages)messages[key]=validatorMessages}try{const result=await schema.object().shape(ruleObject).validate(params);applyMessages(result,ruleObject,messages,params);if(!result.valid)throw new HttpError(422,"Validation failed",{errors:result.errors});return result}catch(error){if(isHttpErrorLike(error))throw error;throw new HttpError(500,getErrorMessage(error)||"An unexpected validation error occurred")}}function applyMessages(result,rules,messages,params){if(result.valid||!result.errors||Array.isArray(result.errors))return;applyFieldMessages(result.errors,rules,messages,params)}function isHttpErrorLike(error){return error instanceof HttpError||error instanceof Error&&typeof error.status==="number"}
1
+ import{basename,relative}from"node:path";import{existsSync}from"node:fs";import{HttpError}from"@stacksjs/error-handling/http-error";import{path}from"@stacksjs/path";import{snakeCase}from"@stacksjs/strings/case";import{getErrorMessage}from"@stacksjs/utils/errors";import{applyFieldMessages}from"./messages";import{beginValidation,reportError}from"./reporter";import{schema}from"./schema";export{validate}from"./request-validator";function globSync(patterns,options={}){const results=[];for(const pattern of patterns){const isAbs=pattern.startsWith("/");const slash=isAbs?pattern.lastIndexOf("/"):-1;const wildcardAt=pattern.indexOf("*");const splitAt=wildcardAt===-1?slash:pattern.lastIndexOf("/",wildcardAt);const cwd=splitAt>0?pattern.slice(0,splitAt):".";const rel=splitAt>0?pattern.slice(splitAt+1):pattern;if(!existsSync(cwd))continue;const glob=new Bun.Glob(rel);for(const match of glob.scanSync({cwd,onlyFiles:true})){results.push(options.absolute?`${cwd}/${match}`:match)}}return results}export function isObjectNotEmpty(obj){if(obj===undefined)return false;return Object.keys(obj).length>0}function toMessageObjects(errors,params){const valueFor=(field)=>{const value=params[field];return value===undefined||value===null?"":String(value)};if(Array.isArray(errors))return errors.map((error)=>({message:error.message,value:"",field:""}));return Object.entries(errors).flatMap(([field,fieldErrors])=>fieldErrors.map((error)=>({message:error.message,value:valueFor(field),field})))}export async function validateField(modelFile,params){beginValidation();const name=modelFile.replace(/\\/g,"/").replace(/\.ts$/,"");if(!name||name.startsWith("/")||name.split("/").some((segment)=>!segment||segment==="."||segment===".."))throw new HttpError(404,"Model not found");const files=new Map;for(const root of[path.userModelsPath(),path.defaultsPath("app/Models")]){for(const file of globSync([`${root}/**/*.ts`],{absolute:true})){const key=relative(root,file).replace(/\\/g,"/");if(!files.has(key))files.set(key,file)}}const exact=files.get(`${name}.ts`);const matches=exact?[exact]:name.includes("/")?[]:[...files.values()].filter((file)=>basename(file)===`${name}.ts`);if(matches.length>1)throw new HttpError(500,`Model ${name} is ambiguous; use its qualified path`);const modelPath=matches[0];if(!modelPath)throw new HttpError(404,`Model ${name} not found`);const model=(await import(modelPath)).default;const attributes=model.attributes;const input=Object.assign(Object.create(null),params);const ruleObject=Object.create(null);const messages=Object.create(null);for(const key in attributes){if(Object.prototype.hasOwnProperty.call(attributes,key)){const attributeKey=attributes[key];if(!attributeKey)continue;const isRequired="isRequired"in(attributeKey.validation?.rule??{})?(attributeKey.validation?.rule).isRequired:false;const field=snakeCase(key);if(Object.hasOwn(params,key))input[field]=params[key];if(Object.hasOwn(input,field))input[key]=input[field];if(attributeKey.default!==undefined&&isRequired===false&&!Object.hasOwn(input,field))continue;ruleObject[snakeCase(key)]=attributeKey.validation?.rule;const validatorMessages=attributeKey.validation?.message;if(validatorMessages)messages[snakeCase(key)]=validatorMessages}}try{const validator=schema.object(ruleObject);const result=await validator.validate(input);applyMessages(result,ruleObject,messages,input);if(!result.valid){reportError(toMessageObjects(result.errors,input));throw new HttpError(422,"Validation failed",{errors:result.errors})}return result}catch(error){if(isHttpErrorLike(error))throw error;throw new HttpError(500,getErrorMessage(error)||"An unexpected validation error occurred")}}const customRuleRegistry=new Map;export function registerRule(name,rule){customRuleRegistry.set(name,rule)}export function getCustomRule(name){return customRuleRegistry.get(name)}export function unique(table,column,exceptId){return async(value)=>{const{db}=await import("@stacksjs/database/runtime");let query=db.selectFrom(table).where(column,"=",value);if(exceptId!==undefined)query=query.where("id","!=",exceptId);const existing=await query.selectAll().executeTakeFirst();return existing?`The ${column} has already been taken`:true}}export function exists(table,column){return async(value)=>{const{db}=await import("@stacksjs/database/runtime");const existing=await db.selectFrom(table).where(column,"=",value).selectAll().executeTakeFirst();return existing?true:`The selected ${column} does not exist`}}export async function validateFieldAsync(modelFile,params,asyncRules){const syncResult=await validateField(modelFile,params);if(asyncRules&&Object.keys(asyncRules).length>0){const asyncErrors=Object.create(null);await Promise.all(Object.entries(asyncRules).map(async([field,validator])=>{const result=await validator(params[field],params);if(result!==true){asyncErrors[field]=typeof result==="string"?result:`${field} validation failed`}}));if(Object.keys(asyncErrors).length>0){reportError(Object.entries(asyncErrors).map(([field,message])=>({field,message,value:String(params[field]??"")})));throw new HttpError(422,"Validation failed",{errors:asyncErrors})}}return syncResult}export async function customValidate(attributes,params){beginValidation();const ruleObject=Object.create(null);const messages=Object.create(null);for(const key in attributes){if(Object.prototype.hasOwnProperty.call(attributes,key)){const rule=attributes[key]?.rule;if(rule)ruleObject[key]=rule;const validatorMessages=attributes[key]?.message;if(validatorMessages)messages[key]=validatorMessages}}try{const validator=schema.object().shape(ruleObject);const result=await validator.validate(params);applyMessages(result,ruleObject,messages,params);if(!result.valid)throw new HttpError(422,"Validation failed",{errors:result.errors});return result}catch(error){if(isHttpErrorLike(error))throw error;throw new HttpError(500,getErrorMessage(error)||"An unexpected validation error occurred")}}function applyMessages(result,rules,messages,params){if(result.valid||!result.errors||Array.isArray(result.errors))return;applyFieldMessages(result.errors,rules,messages,params)}function isHttpErrorLike(error){return error instanceof HttpError||error instanceof Error&&typeof error.status==="number"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@stacksjs/validation",
3
3
  "type": "module",
4
4
  "sideEffects": false,
5
- "version": "0.75.514",
5
+ "version": "0.75.518",
6
6
  "description": "The Stacks Validation ways.",
7
7
  "author": "Chris Breuer",
8
8
  "contributors": [
@@ -64,18 +64,18 @@
64
64
  "prepublishOnly": "bun run build"
65
65
  },
66
66
  "dependencies": {
67
- "@stacksjs/error-handling": "0.75.514",
68
- "@stacksjs/path": "0.75.514",
69
- "@stacksjs/strings": "0.75.514",
67
+ "@stacksjs/error-handling": "0.75.518",
68
+ "@stacksjs/path": "0.75.518",
69
+ "@stacksjs/strings": "0.75.518",
70
70
  "@stacksjs/ts-validation": "^0.5.7",
71
- "@stacksjs/types": "0.75.514",
72
- "@stacksjs/utils": "0.75.514"
71
+ "@stacksjs/types": "0.75.518",
72
+ "@stacksjs/utils": "0.75.518"
73
73
  },
74
74
  "devDependencies": {
75
75
  "better-dx": "^0.2.24"
76
76
  },
77
77
  "peerDependencies": {
78
- "@stacksjs/database": "0.75.514"
78
+ "@stacksjs/database": "0.75.518"
79
79
  },
80
80
  "peerDependenciesMeta": {
81
81
  "@stacksjs/database": {