feat: add all schema validator in top level compiled schema

Author: LeadcodeDev

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.0
+- Added support for all schemas as a high-level entry schema
+- Add benchmarks in [`Dartmark`](https://dartmark.dev) website
+
 ## 1.4.0
 - Add `RegExp` property in phone validation rule
 

lib/src/contracts/vine.dart

@@ -5,7 +5,8 @@ abstract interface class ErrorReporter {
 
   bool hasErrorForField(String fieldName);
 
-  String format(String rule, FieldContext field, String? message, Map<String, dynamic> options);
+  String format(String rule, FieldContext field, String? message,
+      Map<String, dynamic> options);
 
   void report(String rule, List<String> keys, String message);
 
@@ -14,13 +15,12 @@ abstract interface class ErrorReporter {
   void clear();
 }
 
-abstract interface class ValidatorContract {
-}
+abstract interface class ValidatorContract {}
 
 abstract interface class VineValidationContext<T extends ErrorReporter> {
   T get errorReporter;
 
-  Map get data;
+  dynamic get data;
 
   Map<String, dynamic> getFieldContext(List<String> keys);
 }

lib/src/field.dart

@@ -1,11 +1,12 @@
 import 'package:vine/src/contracts/vine.dart';
 
-final class ValidatorContext<T extends ErrorReporter> implements VineValidationContext<T> {
+final class ValidatorContext<T extends ErrorReporter>
+    implements VineValidationContext<T> {
   @override
   final T errorReporter;
 
   @override
-  final Map<String, dynamic> data;
+  final dynamic data;
 
   @override
   Map<String, dynamic> getFieldContext(List<String> keys) {
@@ -20,7 +21,6 @@ final class ValidatorContext<T extends ErrorReporter> implements VineValidationC
     return data;
   }
 
-
   ValidatorContext(this.errorReporter, this.data);
 }
 

lib/src/rule_parser.dart

@@ -1,7 +1,5 @@
 import 'dart:collection';
 
-import 'package:vine/src/contracts/vine.dart';
-import 'package:vine/src/rules/basic_rule.dart';
 import 'package:vine/vine.dart';
 
 abstract interface class RuleParserContract {
@@ -37,7 +35,7 @@ class RuleParser implements RuleParserContract {
       addRule(VineOptionalRule(), positioned: true);
     }
 
-    while(rules.isNotEmpty) {
+    while (rules.isNotEmpty) {
       final rule = rules.removeFirst();
       rule.handle(ctx, field);
 

lib/src/rules/basic_rule.dart

@@ -35,7 +35,8 @@ final class VineRequiredIfExistRule implements VineRule {
     }
 
     if (!matchs.contains(false) && field.value == null) {
-      final error = ctx.errorReporter.format('requiredIfExists', field, null, {});
+      final error =
+          ctx.errorReporter.format('requiredIfExists', field, null, {});
       ctx.errorReporter.report('requiredIfExists', field.customKeys, error);
 
       field.canBeContinue = false;
@@ -61,7 +62,8 @@ final class VineRequiredIfAnyExistRule implements VineRule {
     }
 
     if (hasMatch && field.value == null) {
-      final error = ctx.errorReporter.format('requiredIfExistsAny', field, null, {});
+      final error =
+          ctx.errorReporter.format('requiredIfExistsAny', field, null, {});
       ctx.errorReporter.report('requiredIfExistsAny', field.customKeys, error);
 
       field.canBeContinue = false;
@@ -84,7 +86,8 @@ final class VineRequiredIfMissingRule implements VineRule {
     }
 
     if (!matchs.contains(true) && field.value == null) {
-      final error = ctx.errorReporter.format('requiredIfMissing', field, null, {});
+      final error =
+          ctx.errorReporter.format('requiredIfMissing', field, null, {});
       ctx.errorReporter.report('requiredIfMissing', field.customKeys, error);
 
       field.canBeContinue = false;
@@ -110,7 +113,8 @@ final class VineRequiredIfAnyMissingRule implements VineRule {
     }
 
     if (!hasMatch && field.value == null) {
-      final error = ctx.errorReporter.format('requiredIfMissingAny', field, null, {});
+      final error =
+          ctx.errorReporter.format('requiredIfMissingAny', field, null, {});
       ctx.errorReporter.report('requiredIfMissingAny', field.customKeys, error);
 
       field.canBeContinue = false;

lib/src/rules/enum_rule.dart

@@ -20,7 +20,8 @@ final class VineEnumRule<T> implements VineRule {
         'values': source.map((e) => e.value).toList(),
       });
 
-      ctx.errorReporter.report('enum', [...field.customKeys, field.name], error);
+      ctx.errorReporter
+          .report('enum', [...field.customKeys, field.name], error);
     }
   }
 }

lib/src/rules/object_rule.dart

@@ -12,7 +12,7 @@ final class VineObjectRule implements VineRule {
   @override
   void handle(VineValidationContext ctx, FieldContext field) {
     final fieldValue = field.value;
-    if (fieldValue is! Map<String, dynamic>) {
+    if (fieldValue is! Map) {
       final error = ctx.errorReporter.format('object', field, message, {});
       ctx.errorReporter.report('object', field.customKeys, error);
 
@@ -28,16 +28,17 @@ final class VineObjectRule implements VineRule {
       final key = entry.key;
       final schema = entry.value;
 
-      final currentField =
-      FieldPool.acquire(key, fieldValue.containsKey(key) ? field.value[key] : MissingValue())
+      final currentField = FieldPool.acquire(
+          key, fieldValue.containsKey(key) ? field.value[key] : MissingValue())
         ..customKeys.addAll(List.of(field.customKeys, growable: false));
 
       switch (schema) {
         case VineArray():
           field.customKeys.add(key);
         case VineObject():
           if (!fieldValue.containsKey(key)) {
-            final error = ctx.errorReporter.format('object', field, message, {});
+            final error =
+                ctx.errorReporter.format('object', field, message, {});
             ctx.errorReporter.report('object', field.customKeys, error);
           }
           currentField.customKeys.add(key);

lib/src/schema/enum_schema.dart

@@ -1,11 +1,9 @@
 import 'dart:collection';
 
-import 'package:vine/src/contracts/schema.dart';
-import 'package:vine/src/rule_parser.dart';
-import 'package:vine/src/rules/basic_rule.dart';
 import 'package:vine/vine.dart';
 
-final class VineEnumSchema<T extends VineEnumerable> extends RuleParser implements VineEnum {
+final class VineEnumSchema<T extends VineEnumerable> extends RuleParser
+    implements VineEnum {
   final List<T> _source;
   VineEnumSchema(super._rules, this._source);
 

lib/src/vine.dart

@@ -28,7 +28,8 @@ import 'package:vine/src/schema/string_schema.dart';
 import 'package:vine/src/schema/union_schema.dart';
 
 final class Vine {
-  ErrorReporter Function(Map<String, String> errors) errorReporter = SimpleErrorReporter.new;
+  ErrorReporter Function(Map<String, String> errors) errorReporter =
+      SimpleErrorReporter.new;
 
   VineObject object(Map<String, VineSchema> payload, {String? message}) {
     final Queue<VineRule> rules = Queue();
@@ -100,7 +101,8 @@ final class Vine {
     return VineDateSchema(rules);
   }
 
-  Validator compile(VineSchema schema, {Map<String, String> errors = const {}}) {
+  Validator compile(VineSchema schema,
+      {Map<String, String> errors = const {}}) {
     return Validator(schema.clone(), errors);
   }
 
@@ -128,7 +130,8 @@ final class Validator implements ValidatorContract {
 
   Validator(this._schema, this.errors);
 
-  (ValidationException?, Map<String, dynamic>?) tryValidate(Map<String, dynamic> data) {
+  (ValidationException?, Map<String, dynamic>?) tryValidate(
+      Map<String, dynamic> data) {
     try {
       final result = validate(data);
       return (null, result);
@@ -137,7 +140,7 @@ final class Validator implements ValidatorContract {
     }
   }
 
-  Map<String, dynamic> validate(Map<String, dynamic> data) {
+  T validate<T>(dynamic data) {
     final validatorContext = ValidatorContext(reporter, data);
     final field = Field('', data);
     _schema.parse(validatorContext, field);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: vine
 description: Vine is a robust, typed validation library for Dart/Flutter, designed to simplify and secure data management in applications
-version: 1.4.0
+version: 1.5.0
 repository: https://github.com/LeadcodeDev/vine
 
 platforms: