Web.JSON: Convert control chars.

Author: Milly

autoload/vital/__vital__/Web/JSON.vim

@@ -15,8 +15,43 @@ let s:special_constants = {
     \   'v:null': 'null',
     \   'v:none': 'null',
     \ }
+let s:control_chars = {
+    \   '\': '\\',
+    \   '"': '\"',
+    \   "\x01": '\u0001',
+    \   "\x02": '\u0002',
+    \   "\x03": '\u0003',
+    \   "\x04": '\u0004',
+    \   "\x05": '\u0005',
+    \   "\x06": '\u0006',
+    \   "\x07": '\u0007',
+    \   "\x08": '\b',
+    \   "\x09": '\t',
+    \   "\x0a": '\n',
+    \   "\x0b": '\u000b',
+    \   "\x0c": '\f',
+    \   "\x0d": '\r',
+    \   "\x0e": '\u000e',
+    \   "\x0f": '\u000f',
+    \   "\x10": '\u0010',
+    \   "\x11": '\u0011',
+    \   "\x12": '\u0012',
+    \   "\x13": '\u0013',
+    \   "\x14": '\u0014',
+    \   "\x15": '\u0015',
+    \   "\x16": '\u0016',
+    \   "\x17": '\u0017',
+    \   "\x18": '\u0018',
+    \   "\x19": '\u0019',
+    \   "\x1a": '\u001a',
+    \   "\x1b": '\u001b',
+    \   "\x1c": '\u001c',
+    \   "\x1d": '\u001d',
+    \   "\x1e": '\u001e',
+    \   "\x1f": '\u001f',
+    \ }
 lockvar s:float_constants s:float_nan s:float_inf
-lockvar s:special_constants
+lockvar s:special_constants s:control_chars
 
 function! s:_true() abort
   return v:true
@@ -75,8 +110,7 @@ function! s:decode(json, ...) abort
         \ 'use_token': 0,
         \ 'allow_nan': 1,
         \}, get(a:000, 0, {}))
-  let json = iconv(a:json, 'utf-8', &encoding)
-  let json = join(split(json, "\n"), '')
+  let json = join(split(a:json, "\n"), '')
   let json = substitute(json, '\\u34;', '\\"', 'g')
   let json = substitute(json, '\\u\(\x\x\x\x\)', '\=s:string.nr2enc_char("0x".submatch(1))', 'g')
   if settings.allow_nan
@@ -110,11 +144,8 @@ function! s:encode(val, ...) abort
   if t == 0
     return a:val
   elseif t == 1
-    let json = '"' . escape(a:val, '\"') . '"'
-    let json = substitute(json, "\r", '\\r', 'g')
-    let json = substitute(json, "\n", '\\n', 'g')
-    let json = substitute(json, "\t", '\\t', 'g')
-    return iconv(json, &encoding, 'utf-8')
+    let s = substitute(a:val, '[\x01-\x1f\\"]', '\=s:control_chars[submatch(0)]', 'g')
+    return '"' . s . '"'
   elseif t == 2
     if s:const.true == a:val
       return 'true'

test/Web/JSON.vimspec

@@ -29,6 +29,11 @@ Describe Web.JSON
             \ JSON.decode('"He said \"I''m a vimmer\""'),
             \ 'He said "I''m a vimmer"'
             \)
+      " control chars
+      Assert Equals(JSON.decode('"\u0001\u0002\u0003\u0004\u0005\u0006\u0007"'), "\x01\x02\x03\x04\x05\x06\x07")
+      Assert Equals(JSON.decode('"\b\t\n\u000b\f\r\u000e\u000f"'), "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f")
+      Assert Equals(JSON.decode('"\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017"'), "\x10\x11\x12\x13\x14\x15\x16\x17")
+      Assert Equals(JSON.decode('"\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f"'), "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f")
       " there should be iconv tests as well
     End
 
@@ -105,6 +110,11 @@ Describe Web.JSON
             \ JSON.encode('He said "I''m a vimmer"'),
             \ '"He said \"I''m a vimmer\""'
             \)
+      " control chars
+      Assert Equals(JSON.encode("\x01\x02\x03\x04\x05\x06\x07"), '"\u0001\u0002\u0003\u0004\u0005\u0006\u0007"')
+      Assert Equals(JSON.encode("\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"), '"\b\t\n\u000b\f\r\u000e\u000f"')
+      Assert Equals(JSON.encode("\x10\x11\x12\x13\x14\x15\x16\x17"), '"\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017"')
+      Assert Equals(JSON.encode("\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"), '"\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f"')
       " there should be iconv tests as well
     End