@rip-lang/api 1.0.0 → 1.0.2

package/api.rip

@@ -385,6 +385,22 @@ export isBlank = (obj) ->
 
 capitalize = (str) -> str.charAt(0).toUpperCase() + str.slice(1).toLowerCase()
 
+toMoney = (value, half, cents) ->
+  m = value.replace(/[$, ]/g, '').match(/^([-+]?)(\d*)\.?(\d*)$/)
+  return null unless m
+  intp = m[2] or ''
+  raw  = m[3] or ''
+  return null unless intp.length or raw.length
+  neg  = m[1] is '-'
+  frac = raw.padEnd(3, '0')
+  c    = parseInt((intp or '0') + frac[0] + frac[1], 10) or 0
+  d    = parseInt(frac[2], 10) or 0
+  rest = raw.length > 3 and /[1-9]/.test(raw.slice(3))
+  up = d > 5 or (d is 5 and rest) or (d is 5 and not rest and (if half then c % 2 isnt 0 else true))
+  c += 1 if up
+  c = if neg then -c else c
+  if cents then c else c / 100
+
 export toName = (str, type...) ->
   s = String(str)
   s = s.toLowerCase().replace(/\s+/g, ' ').trim()
@@ -435,23 +451,27 @@ export toPhone = (str) ->
 
 export validators =
   # Numbers & money
-  id:        (v) -> v[/^([1-9]\d{0,19})$/]            and parseInt(_[1])
-  whole:     (v) -> v[/^(0|[1-9]\d{0,19})$/]          and parseInt(_[1])
-  decimal:   (v) -> v[/^([-+]?\d+(?:\.\d*)?|\.\d+)$/] and parseFloat(_[1])
-  money:     (v) -> v[/^([-+]?\d+(?:\.\d*)?|\.\d+)$/] and Math.round(parseFloat(_[1]) * 100)
+  id:         (v) -> v[/^([1-9]\d{0,14})$/]                          and parseInt(_[1])
+  int:        (v) -> v[/^([-+]?(?:0|[1-9]\d{0,14}))$/]               and parseInt(_[1])
+  whole:      (v) -> v[/^(0|[1-9]\d{0,14})$/]                        and parseInt(_[1])
+  float:      (v) -> v[/^([-+]?\d+(?:\.\d*)?|\.\d+)$/]               and parseFloat(_[1])
+  money:      (v) -> v[/^([-+]? ?\$? ?(?:[\d,]+(?:\.\d*)?|\.\d+))$/] and toMoney(_[1])
+  money_even: (v) -> v[/^([-+]? ?\$? ?(?:[\d,]+(?:\.\d*)?|\.\d+))$/] and toMoney(_[1], true)
+  cents:      (v) -> v[/^([-+]? ?\$? ?(?:[\d,]+(?:\.\d*)?|\.\d+))$/] and toMoney(_[1], false, true)
+  cents_even: (v) -> v[/^([-+]? ?\$? ?(?:[\d,]+(?:\.\d*)?|\.\d+))$/] and toMoney(_[1], true,  true)
 
   # Strings & formatting
-  string:    (v) -> v.replace(/\s\s+/g, ' ')
-  text:      (v) -> v.replace(/  +/g, ' ')
+  string:    (v) -> v.replace(/(?:\t+|\s{2,})/g, ' ')
+  text:      (v) -> v.replace(/  +/g  , ' ')
 
   # Name/address
-  name:      (v) -> v.replace(/\s+/g, ' ')
-  address:   (v) -> v.replace(/\s+/g, ' ')
+  name:      (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'name'
+  address:   (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'address'
 
-  # Time & date
-  time:      (v) -> v[/^([01]?\d|2[0-3]):[0-5]\d(:[0-5]\d)?$/] and _[0]
-  date:      (v) -> v[/^\d{4}-\d{2}-\d{2}$/]                   and _[0]
-  dateutc:   (v) -> v[/^\d{4}-\d{2}-\d{2}Z?$/]                 and _[0]
+  # Date & time
+  date:      (v) -> v[/^\d{4}(-?)\d{2}\1\d{2}$/]                                and _[0]
+  time:      (v) -> v[/^(2[0-3]|[01]?\d):([0-5]\d)(?::([0-5]\d))?$/]            and _[0]
+  time12:    (v) -> v[/^(1[0-2]|0?[1-9]):([0-5]\d)(?::([0-5]\d))?\s?(am|pm)$/i] and _[0].toLowerCase()
 
   # Booleans
   truthy:    (v) -> (v =~ /^(true|t|1|yes|y|on)$/i)  and true
@@ -459,7 +479,7 @@ export validators =
   bool:      (v) -> if v =~ /^(true|t|1|yes|y|on)$/i then true else if v =~ /^(false|f|0|no|n|off)$/i then false else null
 
   # Contact, geo, identity
-  email:     (v) -> v[/^([a-zA-Z0-9._%+-]+)@([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/] and _[0]
+  email:     (v) -> v[/^([a-zA-Z0-9._%+-]+)@([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/i] and _[0]
   state:     (v) -> v[/^([a-z][a-z])$/i]              and _[1].toUpperCase()
   zip:       (v) -> v[/^(\d{5})/]                     and _[1]
   zipplus4:  (v) -> v[/^(\d{5})-?(\d{4})$/]           and "#{_[1]}-#{_[2]}"
@@ -470,26 +490,21 @@ export validators =
   phone:     (v) -> toPhone(v)
 
   # Web & technical
-  username:  (v) -> v[/^([a-zA-Z0-9_-]{3,20})$/]        and _[1].toLowerCase()
-  ip:        (v) -> v[/^(?:\d{1,3}\.){3}\d{1,3}$/]      and _[0]
+  username:  (v) -> v[/^([a-zA-Z0-9_-]{3,20})$/] and _[1].toLowerCase()
+  ip:        (v) -> v[/^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/] and _[0]
   mac:       (v) -> v[/^([0-9a-fA-F]{2})(?:[:-]?)([0-9a-fA-F]{2})(?:[:-]?)([0-9a-fA-F]{2})(?:[:-]?)([0-9a-fA-F]{2})(?:[:-]?)([0-9a-fA-F]{2})(?:[:-]?)([0-9a-fA-F]{2})$/] and "#{_[1]}:#{_[2]}:#{_[3]}:#{_[4]}:#{_[5]}:#{_[6]}".toLowerCase()
-  url:       (v) -> v[/^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w\.-]*)*\/?$/] and _[0]
+  url:       (v) -> v[/^(https?:\/\/)[^\s/$.?#].[^\s]*$/i] and _[0]
   color:     (v) -> v[/^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/] and "##{_[1].toLowerCase()}"
   uuid:      (v) -> v[/^([0-9a-f]{8})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{12})$/i] and "#{_[1]}-#{_[2]}-#{_[3]}-#{_[4]}-#{_[5]}".toLowerCase()
   semver:    (v) -> v[/^(\d+)\.(\d+)\.(\d+)(?:-([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*))?(?:\+([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*))?$/] and _[0]
 
-  # Time formats & currency
-  time24:    (v) -> v[/^([01]?[0-9]|2[0-3]):([0-5][0-9])(?::([0-5][0-9]))?$/] and _[0]
-  time12:    (v) -> v[/^(1[0-2]|0?[1-9]):([0-5][0-9])\s?(am|pm)$/i]           and _[0].toLowerCase()
-  currency:  (v) -> v[/^\$?(\d{1,3}(?:,\d{3})*(?:\.\d{2})?)$/]                and parseFloat(_[1].replace(/,/g, ''))
-
   # Collections & structured
   array:     (v) -> Array.isArray(v) and v or null
   hash:      (v) -> (v? and typeof v is 'object' and not Array.isArray(v)) and v or null
   json:      (v) -> if typeof v is 'string' then (try JSON.parse(v) catch then null) else if typeof v is 'object' then v else null
 
   # Slugs & ids list
-  slug:      (v) -> v[/^([a-z0-9]+(?:-[a-z0-9]+)*)$/] and _[1]
+  slug:      (v) -> v[/^([a-z0-9]+(?:-[a-z0-9]+)*)$/i] and _[1].toLowerCase()
   ids:       (v) ->
     cleaned = v.replace(/[, ]+/g, ' ').trim()
     return null unless cleaned

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/api",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Pure Rip API framework — elegant, fast, zero dependencies",
   "type": "module",
   "main": "api.rip",