Merge pull request #58 from ferflores507/dev

Dev

Author: ferflores507

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ferflores507/object-builder",
-  "version": "9.7.1",
+  "version": "9.8.0",
   "main": "index.js",
   "scripts": {
     "test": "vitest"

src/builders/ObjectBuilder.ts

@@ -184,7 +184,7 @@ export class ObjectBuilder implements Builder {
                 ? { definition, task: options }
                 : {
                     ...options,
-                    definition: options.transform(definition),
+                    definition: options.transform(definition, this),
                 })
     }
 

src/builders/Operators.ts

@@ -170,6 +170,25 @@ export class Operators implements WithTaskOptions<Operators> {
             return Object.fromEntries(filteredEntries)
         }
     }
+    validate = {
+        transform: (schema: SchemaDefinition, builder: Builder) : Schema => {
+            const newSchema = Array.isArray(schema)
+                ? schema 
+                : builder.with({ schema }).build()
+
+            return {
+                const: {
+                    result: builder.with({ schema: newSchema }).build(),
+                    schema: newSchema
+                }
+            }
+        },
+        task: (initial: any, { result, schema }: { result: any, schema: SchemaDefinition }) => {
+            const [results, schemas] = [result, schema].map(toArray)
+
+            return results.every(Boolean) || schemas.filter((el, i) => !results[i])
+        }
+    }
     join = {
         task: (source: [], separator: any) => source.join(separator),
         transform: (schema: any) => schema === true ? "" : schema

src/helpers/varios.ts

@@ -363,7 +363,7 @@ export const tryCopy = (obj: {}) => {
     return obj
 }
 
-export const toArray = <T>(value: T) => Array.isArray(value) ? value : [value]
+export const toArray = <T>(value: T | T[]) => Array.isArray(value) ? value : [value]
 
 export const toArrayOrNull = (value: any) => value != null ? toArray(value) : null
 

src/models.ts

@@ -37,7 +37,7 @@ export type OperatorTask = (current: any, previous: any, builder: Builder) => an
 
 export type TaskOptions = OperatorTask | {
     task: OperatorTask,
-    transform: (schema: Schema) => any
+    transform: (schema: Schema, builder: Builder) => any
 }
 
 export type WithTaskOptions<T> = { [key in keyof T]: TaskOptions }
@@ -174,6 +174,7 @@ export type Schema = Partial<{
     unpackAsGetters: SchemaDefinition
     use: string
     UUID: true
+    validate: SchemaDefinition
     values: true
     with: Schema
 }> & ArraySchema

tests/schema/mixed.test.ts

@@ -8,6 +8,66 @@ import { Queue } from '../../src/helpers/Queue'
 import { TaskBuilder } from '../../src/builders/TaskBuilder'
 import { Propiedades } from '../../src/models'
 
+describe("validate", () => {
+  const validate = [
+    {
+      path: "id",
+      greaterThan: 6,
+      lessThan: 8
+    },
+    {
+      path: "name.length",
+      greaterThan: 4,
+      lessThan: 10
+    }
+  ]
+
+  test("validate with explicit schema", async () => {
+    await expectToEqualAsync({
+      store: {
+        id: 6,
+        name: "Mel",
+        age: 5
+      },
+      schema: {
+        validate: {
+          const: validate
+        }
+      },
+      expected: validate
+    })
+  })
+
+  test("validate returns array of failed schemas", async () => {
+    await expectToEqualAsync({
+      store: {
+        id: 6,
+        name: "Mel",
+        age: 5
+      },
+      schema: {
+        validate
+      },
+      expected: validate
+    })
+  })
+
+  test("validate returns true", async () => {
+    await expectToEqualAsync({
+      store: {
+        id: 7,
+        name: "Melany",
+        age: 5
+      },
+      schema: {
+        validate
+      },
+      expected: true
+    })
+  })
+  
+})
+
 describe("children schema", () => {
   const childrenSchema = {
     a: {