@rip-lang/api 0.8.0 → 0.8.1

package/api.rip

@@ -508,91 +508,81 @@ export getValidator      = (name)     -> validators[name]
 # read() — Sinatra-style Parameter Reading
 # ==============================================================================
 
-export read = (keyOrTag = null, tagOrMiss = null, missOrNil = null) ->
-  store = requestContext.getStore()
-  unless store?
-    throw new Error 'read() called outside request context'
+export read = (name = null, type = null, miss = null) ->
+  store = requestContext.getStore() or throw new Error 'no context for read()'
 
-  data = store.data or {}
-  key  = null
-  tag  = null
-  miss = null
+  # missing value helper
+  done = (must = false) ->
+    return miss() if typeof miss is 'function'
+    throw new Error "Missing required field: #{name}" if must
+    return miss ?? null
 
-  [key, tag, miss] = typeof keyOrTag is 'string' \
-    ? [keyOrTag, tagOrMiss, missOrNil]           \
-    : [null    , keyOrTag , tagOrMiss]
+  # get value from store
+  v = store.data or {}
+  v = v[name] if name?
+  v = v.trim() if typeof v is 'string'
 
-  raw = if key? then data[key] else data
-  unless tag?
-    return raw if raw?
-    return miss() if typeof miss is 'function'
-    return if miss? and miss isnt '' then miss else null
+  # value only, no validator
+  if !type?
+    return v if v?
+    return done()
 
-  required = false
-  if typeof tag is 'string' and tag.endsWith('!')
-    required = true
-    tag = tag.slice(0, -1)
+  # String: apply validator function
+  else if typeof type is 'string'
 
-  v = raw
-  v = v.trim() if typeof v is 'string'
+    # detect required value (trailing '!')
+    if type.endsWith '!'
+      must = true
+      type = type.slice(0, -1)
+
+    # apply validator function
+    f = getValidator(type)
+    v = String(v ?? '') unless type in ['array', 'hash', 'json']
+    v = if f then f(v) else null
 
-  # Named validator
-  if typeof tag is 'string'
-    fn = getValidator(tag)
-    v = if fn then fn(String(v or '')) else null
+  # Regex: apply regex pattern
+  else if type instanceof RegExp
+    s = String(v ?? '')
+    v = s.match(type)?[0] or null
 
   # Array: [min, max] constraint or enumeration
-  else if Array.isArray(tag)
-    if typeof tag[0] is 'number'
-      minVal = tag[0]
-      maxVal = tag[1]
-      if typeof v is 'number' or (String(v) =~ /^[-+]?\d+$/)
-        n = if typeof v is 'number' then v else parseInt(String(v))
-        ok = not isNaN(n)
-        ok = false if minVal? and n < minVal
-        ok = false if maxVal? and n > maxVal
-        v = if ok then n else null
+  else if Array.isArray(type)
+    s = String(v ?? '')
+    y = true
+    if typeof type[0] is 'number'
+      [min, max] = type
+      if typeof v is 'number' or (s =~ /^[-+]?\d+$/)
+        n = if typeof v is 'number' then v else +s
+        y = false if min? and n < min
+        y = false if max? and n > max
+        v = if y then n else null
       else
-        s = String(v or '')
-        ok = true
-        ok = false if minVal? and s.length < minVal
-        ok = false if maxVal? and s.length > maxVal
-        v = if ok then s else null
+        y = false if min? and s.length < min
+        y = false if max? and s.length > max
+        v = if y then s else null
     else
-      v = if tag.includes(String(v)) then String(v) else null
-
-  # Regex
-  else if tag instanceof RegExp
-    v = String(v or '').match(tag)?[0] or null
-
-  # Object constraints
-  else if typeof tag is 'object'
-    if tag.start? or tag.end?
-      n = parseInt(v)
-      v = if not isNaN(n) and (not tag.start? or n >= tag.start) and (not tag.end? or n <= tag.end) then n else null
-    else if tag.min? or tag.max?
-      if typeof v is 'number' or (String(v or '') =~ /^[-+]?\d+$/)
-        n = if typeof v is 'number' then v else parseInt(String(v))
-        ok = not isNaN(n)
-        ok = false if tag.min? and n < tag.min
-        ok = false if tag.max? and n > tag.max
-        v = if ok then n else null
+      v = if type.includes(s) then s else null
+
+  # Object: start/end, min/max
+  else if type? and typeof type is 'object'
+    s = String(v ?? '')
+    if type.start? or type.end?
+      n = if s =~ /^[-+]?\d+$/ then +s else NaN
+      v = if not isNaN(n) and (not type.start? or n >= type.start) and (not type.end? or n <= type.end) then n else null
+    else if type.min? or type.max?
+      y = true
+      if typeof v is 'number' or (s =~ /^[-+]?\d+$/)
+        n = if typeof v is 'number' then v else +s
+        y = false if type.min? and n < type.min
+        y = false if type.max? and n > type.max
+        v = if y then n else null
       else
-        s = String(v or '')
-        ok = true
-        ok = false if tag.min? and s.length < tag.min
-        ok = false if tag.max? and s.length > tag.max
-        v = if ok then s else null
-
-  blank = v is null or v is undefined or (typeof v is 'string' and v.trim() is '')
-
-  if blank
-    if required
-      return miss?() if typeof miss is 'function'
-      throw new Error "Missing required field: #{key}"
-    else
-      return miss?() if typeof miss is 'function'
-      return null if miss is '' or not miss?  # Empty string or null/undefined → null
-      return miss  # Return 0, false, etc. as-is
+        y = false if type.min? and s.length < type.min
+        y = false if type.max? and s.length > type.max
+        v = if y then s else null
+
+  # blank / missing value handling
+  if not v? or (typeof v is 'string' and v.trim() is '')
+    return done(must)
 
   v

package/package.json

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