Merge pull request #12 from willothy/feat-validator-combinators

Feat validator combinators

docs/pages/docs/components/form.mdx

@@ -38,14 +38,14 @@ n.form(
 
 #### on_submit
 
-<Property 
+<Property
   defaultValue="fn.ignore"
   types={['fun(is_valid: boolean): nil']}
 />
 
 #### submit_key
 
-<Property 
+<Property
   defaultValue="<C-CR>"
   types={['string[]', 'string']}
 />
@@ -63,4 +63,11 @@ Available validation functions:
 - `equals`
 - `contains`
 
+Available combinators:
+
+- `all`: ensures all validators pass
+- `any`: ensures at least one validator passes
+- `none`: ensures no validators pass
+- `compose` (deprecated, use `all`)
+
 

lua/nui-components/validators.lua

@@ -1,11 +1,13 @@
 local M = {}
 
+---@type fun(min: integer): fun(arg: string): boolean
 function M.min_length(min)
   return function(arg)
     return #arg >= min
   end
 end
 
+---@type fun(arg: string): boolean
 M.is_not_empty = M.min_length(1)
 
 function M.max_length(max)
@@ -14,23 +16,52 @@ function M.max_length(max)
   end
 end
 
+---@type fun(pattern: string): fun(arg: string): boolean
 function M.contains(pattern)
   return function(arg)
-    return string.find(arg, pattern)
+    return string.find(arg, pattern) ~= nil
   end
 end
 
+---@type fun(value: any): fun(arg: any): boolean
 function M.equals(value)
   return function(arg)
     return vim.deep_equal(value, arg)
   end
 end
 
-function M.compose(...)
-  local tbl = { ... }
+---@type fun(...: fun(arg: any): boolean): fun(arg: any): boolean
+function M.none(...)
+  local validators = { ... }
+  return function(value)
+    for _, fn in ipairs(validators) do
+      if fn(value) then
+        return false
+      end
+    end
+    return true
+  end
+end
+
+---@type fun(...: fun(arg: any): boolean): fun(arg: any): boolean
+function M.any(...)
+  local validators = { ... }
+  return function(value)
+    for _, fn in ipairs(validators) do
+      if fn(value) then
+        return true
+      end
+    end
+    return false
+  end
+end
+
+---@type fun(...: fun(arg: any): boolean): fun(arg: any): boolean
+local function all(...)
+  local validators = { ... }
 
   return function(value)
-    for _, fn in ipairs(tbl) do
+    for _, fn in ipairs(validators) do
       if not fn(value) then
         return false
       end
@@ -40,4 +71,8 @@ function M.compose(...)
   end
 end
 
+M.all = all
+
+M.compose = all
+
 return M