Web.JSON: Default to use vim-variables (e.g. v:true).

Author: Milly

autoload/vital/__vital__/Web/JSON.vim

@@ -48,16 +48,24 @@ let s:float_nan = 0.0 / 0
 let s:float_inf = 1.0 / 0
 lockvar s:float_constants s:float_nan s:float_inf
 
+let s:special_constants = {
+    \   'v:true': 'true',
+    \   'v:false': 'false',
+    \   'v:null': 'null',
+    \   'v:none': 'null',
+    \ }
+lockvar s:special_constants
+
 function! s:_true() abort
-  return 1
+  return v:true
 endfunction
 
 function! s:_false() abort
-  return 0
+  return v:false
 endfunction
 
 function! s:_null() abort
-  return 0
+  return v:null
 endfunction
 
 function! s:_resolve(val, prefix) abort
@@ -169,6 +177,8 @@ function! s:encode(val, ...) abort
       throw 'vital: Web.JSON: Invalid float value: ' . val
     endif
     return val
+  elseif t == 6 || t == 7
+    return get(s:special_constants, a:val)
   else
     return string(a:val)
   endif

doc/vital/Web/JSON.txt

@@ -85,7 +85,7 @@ decode({json}[, {settings}])		*Vital.Web.JSON.decode()*
 	'use_token'
 	Use special tokens (e.g. |Vital.Web.JSON.true|) to represent
 	corresponding javascript tokens (e.g. 'true').
-	Otherwise 1 or 0 are used to represent these.
+	Otherwise |v:true|, |v:false| or |v:null| are used to represent these.
 	The default value is 0.
 >
 	echo s:JSON.decode('[true, false, null]')

test/Web/JSON.vimspec

@@ -75,6 +75,9 @@ Describe Web.JSON
       Assert Equals(JSON.decode('true'), 1)
       Assert Equals(JSON.decode('false'), 0)
       Assert Equals(JSON.decode('null'), 0)
+      Assert Same(JSON.decode('true'), v:true)
+      Assert Same(JSON.decode('false'), v:false)
+      Assert Same(JSON.decode('null'), v:null)
 
       let s = { 'use_token': 1 }
       Assert Equals(JSON.decode('true', s), JSON.true)
@@ -241,6 +244,11 @@ Describe Web.JSON
       Assert Equals(JSON.encode(JSON.true), 'true')
       Assert Equals(JSON.encode(JSON.false), 'false')
       Assert Equals(JSON.encode(JSON.null), 'null')
+
+      Assert Equals(JSON.encode(v:true), 'true')
+      Assert Equals(JSON.encode(v:false), 'false')
+      Assert Equals(JSON.encode(v:null), 'null')
+      Assert Equals(JSON.encode(v:none), 'null')
     End
 
     It encodes special floats (NaN/Infinity/-Infinity)