@stacksjs/validation 0.59.11 → 0.61.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/validation",
   "type": "module",
-  "version": "0.59.11",
+  "version": "0.61.1",
   "description": "The Stacks Validation ways.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -50,15 +50,14 @@
   "peerDependencies": {
     "@stacksjs/strings": "latest",
     "@stacksjs/types": "latest",
-    "@vinejs/vine": "^1.7.1"
+    "@vinejs/vine": "^2.0.0"
   },
   "dependencies": {
     "@stacksjs/strings": "latest",
     "@stacksjs/types": "latest",
-    "@vinejs/vine": "^1.7.1"
+    "@vinejs/vine": "^2.0.0"
   },
   "devDependencies": {
-    "@stacksjs/development": "latest",
-    "@stacksjs/vite": "latest"
+    "@stacksjs/development": "latest"
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
 export * from './is'
 export * from './rules'
-export * from './validate'
+export * from './schema'
 export * from './types'

package/src/is.ts

@@ -71,7 +71,14 @@ export function isArray(v: any) {
 
 export function isPrimitive(v: any) {
   const type = getTypeName(v)
-  return type === 'null' || type === 'undefined' || type === 'string' || type === 'number' || type === 'boolean' || type === 'symbol'
+  return (
+    type === 'null' ||
+    type === 'undefined' ||
+    type === 'string' ||
+    type === 'number' ||
+    type === 'boolean' ||
+    type === 'symbol'
+  )
 }
 
 export function isInteger(v: any) {

package/src/rules.ts

@@ -1,6 +1,6 @@
 import { USD } from '@dinero.js/currencies'
 import { dinero as currency } from 'dinero.js'
-import { validator } from './validate'
+import { schema } from './schema'
 
 /**
  * Thanks to VineJS for the following types:
@@ -95,22 +95,18 @@ export interface ErrorReporterContract {
   report: (message: string, rule: string, field: FieldContext, args?: Record<string, any>) => any
 }
 
-export const isMoney = validator.createRule((value: unknown, _, field: FieldContext) => {
+export const isMoney = schema.createRule((value: unknown, _, field: FieldContext) => {
   /**
    * Convert string representation of a number to a JavaScript
    * Number data type.
    */
-  const numericValue = validator.helpers.asNumber(value)
+  const numericValue = schema.helpers.asNumber(value)
 
   /**
    * Report error, if the value is NaN post-conversion
    */
   if (Number.isNaN(numericValue)) {
-    field.report(
-      'The {{ field }} field value must be a number',
-      'money',
-      field,
-    )
+    field.report('The {{ field }} field value must be a number', 'money', field)
     return
   }
 
@@ -123,4 +119,4 @@ export const isMoney = validator.createRule((value: unknown, _, field: FieldCont
    * Mutate the field's value
    */
   field.mutate(amount, field)
-}) as any
+})

package/src/schema.ts

@@ -0,0 +1,25 @@
+import schema, { Vine } from '@vinejs/vine'
+import rule from 'validator'
+import { MoneyValidator } from './types/money'
+
+export { schema, rule }
+
+// @ts-expect-error - investigate why this is not working
+Vine.macro('money', () => new MoneyValidator())
+
+type SchemaString = string
+type SchemaNumber = number
+type SchemaBoolean = boolean
+type SchemaEnum = string[]
+
+export type SchemaType = SchemaString | SchemaNumber | SchemaBoolean | SchemaEnum
+
+export type { Infer } from '@vinejs/vine/types'
+export { VineString, VineBoolean, VineEnum, VineNumber, VineDate } from '@vinejs/vine'
+
+export const validate = {
+  string: (defaultValue = ''): SchemaString => defaultValue,
+  number: (defaultValue = 1): SchemaNumber => defaultValue,
+  boolean: (defaultValue = true): SchemaBoolean => defaultValue,
+  enum: (values: string[]): SchemaEnum => values,
+}

package/src/types/money.ts

@@ -3,15 +3,12 @@ import { BaseLiteralType } from '@vinejs/vine'
 import type { FieldOptions, Validation } from '@vinejs/vine/types'
 import { isMoney } from '../rules'
 
-export class MoneyValidator extends BaseLiteralType<Money, Money> {
+export class MoneyValidator extends BaseLiteralType<string, Money, Money> {
   constructor(options?: FieldOptions, validations?: Validation<any>[]) {
     super(options, validations || [isMoney()])
   }
 
   clone() {
-    return new MoneyValidator(
-      this.cloneOptions(),
-      this.cloneValidations(),
-    ) as this
+    return new MoneyValidator(this.cloneOptions(), this.cloneValidations()) as this
   }
 }

package/dist/index.d.ts

@@ -1,4 +0,0 @@
-export * from './is';
-export * from './rules';
-export * from './validate';
-export * from './types';

package/dist/is.d.ts

@@ -1,28 +0,0 @@
-export declare function isDef<T = any>(val?: T): val is T;
-export declare function isBoolean(val: any): val is boolean;
-export declare function isFunction<T extends Function>(val: any): val is T;
-export declare function isNumber(val: any): val is number;
-export declare function isString(val: unknown): val is string;
-export declare function isObject(val: any): val is object;
-export declare function isWindow(val: any): boolean;
-export declare const isBrowser: boolean;
-export declare const isServer: boolean;
-export declare function isMap(val: any): val is Map<any, any>;
-export declare function isSet(val: any): val is Set<any>;
-export declare function isPromise<T = any>(val: any): val is Promise<T>;
-export declare function isUndefined(v: any): boolean;
-export declare function isNull(v: any): boolean;
-export declare function isSymbol(v: any): boolean;
-export declare function isDate(v: any): boolean;
-export declare function isRegExp(v: any): boolean;
-export declare function isArray(v: any): boolean;
-export declare function isPrimitive(v: any): boolean;
-export declare function isInteger(v: any): boolean;
-export declare function isFloat(v: any): boolean;
-export declare function isPositive(v: any): boolean;
-export declare function isNegative(v: any): boolean;
-export declare function isEven(v: any): boolean;
-export declare function isOdd(v: any): boolean;
-export declare function isEvenOrOdd(v: any): false | "even" | "odd";
-export declare function isPositiveOrNegative(v: any): false | "positive" | "negative";
-export declare function isIntegerOrFloat(v: any): false | "integer" | "float";

package/dist/rules.d.ts

@@ -1,80 +0,0 @@
-/**
- * Thanks to VineJS for the following types:
- *
- * The context shared with the entire validation pipeline.
- * Each field gets its own context object.
- */
-export interface FieldContext {
-    /**
-     * Field value
-     */
-    value: unknown;
-    /**
-     * The data property is the top-level object under validation.
-     */
-    data: any;
-    /**
-     * Shared metadata across the entire validation lifecycle. It can be
-     * used to pass data between validation rules
-     */
-    meta: Record<string, any>;
-    /**
-     * Mutate the value of field under validation.
-     */
-    mutate: (newValue: any, field: FieldContext) => void;
-    /**
-     * Report error to the error reporter
-     */
-    report: ErrorReporterContract['report'];
-    /**
-     * Is this field valid. Default: true
-     */
-    isValid: boolean;
-    /**
-     * Is this field has value defined.
-     */
-    isDefined: boolean;
-    /**
-     * Wildcard path for the field. The value is a nested
-     * pointer to the field under validation.
-     *
-     * In case of arrays, the `*` wildcard is used.
-     */
-    wildCardPath: string;
-    /**
-     * The parent property is the parent of the field. It could be an
-     * array or an object.
-     */
-    parent: any;
-    /**
-     * Name of the field under validation. In case of an array, the field
-     * name will be a number
-     */
-    name: string | number;
-    /**
-     * Is this field an array member
-     */
-    isArrayMember: boolean;
-}
-/**
- * Thanks to VineJS for the following types:
- *
- * The error reporter is used to report errors during the validation
- * process.
- */
-export interface ErrorReporterContract {
-    /**
-     * A boolean to known if there are one or more
-     * errors.
-     */
-    hasErrors: boolean;
-    /**
-     * Creates an instance of an exception to throw
-     */
-    createError: () => Error;
-    /**
-     * Report error for a field
-     */
-    report: (message: string, rule: string, field: FieldContext, args?: Record<string, any>) => any;
-}
-export declare const isMoney: any;

package/dist/types/index.d.ts

@@ -1,2 +0,0 @@
-export * from './money';
-export { VineEnum as ValidationEnum, VineBoolean as ValidationBoolean, VineNumber as ValidationNumber, VineString as ValidationString, } from '@vinejs/vine';

package/dist/types/money.d.ts

@@ -1,7 +0,0 @@
-import type { Money } from '@stacksjs/types';
-import { BaseLiteralType } from '@vinejs/vine';
-import type { FieldOptions, Validation } from '@vinejs/vine/types';
-export declare class MoneyValidator extends BaseLiteralType<Money, Money> {
-    constructor(options?: FieldOptions, validations?: Validation<any>[]);
-    clone(): this;
-}

package/dist/validate.d.ts

@@ -1,21 +0,0 @@
-import { Vine as Validator } from '@vinejs/vine';
-export declare const validator: Validator;
-type SchemaString = string;
-type SchemaNumber = number;
-type SchemaBoolean = boolean;
-type SchemaEnum = string[];
-export type SchemaType = SchemaString | SchemaNumber | SchemaBoolean | SchemaEnum;
-export declare const validate: {
-    string: (defaultValue?: string) => SchemaString;
-    number: (defaultValue?: number) => SchemaNumber;
-    boolean: (defaultValue?: boolean) => SchemaBoolean;
-    enum: (values: string[]) => SchemaEnum;
-};
-export declare const RuleString: Validator['string'];
-export declare const RuleNumber: Validator['number'];
-export declare const RuleBoolean: Validator['boolean'];
-export declare const RuleArray: Validator['array'];
-export declare const RuleObject: Validator['object'];
-export declare const RuleAny: Validator['any'];
-export type { Infer } from '@vinejs/vine/types';
-export { VineString, VineBoolean, VineEnum, VineNumber } from '@vinejs/vine';

package/src/validate.ts

@@ -1,33 +0,0 @@
-import v, { Vine as Validator } from '@vinejs/vine'
-import { MoneyValidator } from './types/money'
-
-Validator.macro('money', () => {
-  return new MoneyValidator()
-})
-
-export const validator: Validator = v
-// validator.string().email()
-type SchemaString = string
-type SchemaNumber = number
-type SchemaBoolean = boolean
-type SchemaEnum = string[]
-
-export type SchemaType = SchemaString | SchemaNumber | SchemaBoolean | SchemaEnum
-
-export const validate = {
-  string: (defaultValue: string = ''): SchemaString => defaultValue,
-  number: (defaultValue: number = 1): SchemaNumber => defaultValue,
-  boolean: (defaultValue: boolean = true): SchemaBoolean => defaultValue,
-  enum: (values: string[]): SchemaEnum => values,
-}
-
-export const RuleString: Validator['string'] = (...args) => validator.string(...args)
-export const RuleNumber: Validator['number'] = (...args) => validator.number(...args)
-export const RuleBoolean: Validator['boolean'] = (...args) => validator.boolean(...args)
-export const RuleArray: Validator['array'] = (...args) => validator.array(...args)
-export const RuleObject: Validator['object'] = (...args) => validator.object(...args)
-export const RuleAny: Validator['any'] = (...args) => validator.any(...args)
-// const email = () => validator.string().email()
-
-export type { Infer } from '@vinejs/vine/types'
-export { VineString, VineBoolean, VineEnum, VineNumber } from '@vinejs/vine'