Web.JSON: Convert encoding. Add 'from_encoding' setting to encode().

Author: Milly

autoload/vital/__vital__/Web/JSON.vim

@@ -110,7 +110,8 @@ function! s:decode(json, ...) abort
         \ 'use_token': 0,
         \ 'allow_nan': 1,
         \}, get(a:000, 0, {}))
-  let json = join(split(a:json, "\n"), '')
+  let json = iconv(a:json, 'utf-8', &encoding)
+  let json = join(split(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
@@ -138,13 +139,19 @@ function! s:encode(val, ...) abort
   let settings = extend({
         \ 'indent': 0,
         \ 'allow_nan': 1,
+        \ 'from_encoding': &encoding,
         \}, get(a:000, 0, {})
         \)
+  return s:_encode(a:val, settings)
+endfunction
+
+function! s:_encode(val, settings) abort
   let t = type(a:val)
   if t == 0
     return a:val
   elseif t == 1
-    let s = substitute(a:val, '[\x01-\x1f\\"]', '\=s:control_chars[submatch(0)]', 'g')
+    let s = iconv(a:val, a:settings.from_encoding, 'utf-8')
+    let s = substitute(s, '[\x01-\x1f\\"]', '\=s:control_chars[submatch(0)]', 'g')
     return '"' . s . '"'
   elseif t == 2
     if s:const.true == a:val
@@ -158,12 +165,12 @@ function! s:encode(val, ...) abort
       return string(a:val)
     endif
   elseif t == 3
-    return s:_encode_list(a:val, settings)
+    return s:_encode_list(a:val, a:settings)
   elseif t == 4
-    return s:_encode_dict(a:val, settings)
+    return s:_encode_dict(a:val, a:settings)
   elseif t == 5
     let val = string(a:val)
-    if settings.allow_nan
+    if a:settings.allow_nan
       let val = get(s:float_constants, val, val)
     elseif has_key(s:float_constants, val)
       throw 'vital: Web.JSON: Invalid float value: ' . val
@@ -181,7 +188,7 @@ function! s:_encode_list(val, settings) abort
   if empty(a:val)
     return '[]'
   elseif !a:settings.indent
-    let encoded_candidates = map(copy(a:val), 's:encode(v:val, a:settings)')
+    let encoded_candidates = map(copy(a:val), 's:_encode(v:val, a:settings)')
     return printf('[%s]', join(encoded_candidates, ','))
   else
     let previous_indent = get(a:settings, '_previous_indent')
@@ -191,7 +198,7 @@ function! s:_encode_list(val, settings) abort
           \})
     let encoded_candidates = map(
           \ copy(a:val),
-          \ printf('''%s'' . s:encode(v:val, ns)', repeat(' ', indent)),
+          \ printf('''%s'' . s:_encode(v:val, ns)', repeat(' ', indent)),
           \)
     return printf(
           \ "[\n%s\n%s]",
@@ -208,7 +215,7 @@ function! s:_encode_dict(val, settings) abort
     return '{}'
   elseif !a:settings.indent
     let encoded_candidates = map(keys(a:val),
-          \ 's:encode(v:val, a:settings) . '':'' . s:encode(a:val[v:val], a:settings)'
+          \ 's:_encode(v:val, a:settings) . '':'' . s:_encode(a:val[v:val], a:settings)'
           \)
     return printf('{%s}', join(encoded_candidates, ','))
   else
@@ -219,7 +226,7 @@ function! s:_encode_dict(val, settings) abort
           \})
     let encoded_candidates = map(keys(a:val),
           \ printf(
-          \   '''%s'' . s:encode(v:val, ns) . '': '' . s:encode(a:val[v:val], ns)',
+          \   '''%s'' . s:_encode(v:val, ns) . '': '' . s:_encode(a:val[v:val], ns)',
           \   repeat(' ', indent),
           \ ),
           \)

test/Web/JSON.vimspec

@@ -34,7 +34,22 @@ Describe Web.JSON
       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
+      " multibyte
+      Assert Equals(JSON.decode('"s¢cĴgё"'), "s¢cĴgё")
+    End
+
+    It decodes strings with character encoding
+      let expected_utf8 = "sあc漢g"
+      Assert Equals(JSON.decode('"sあc漢g"'), expected_utf8)
+
+      let expected_sjis = iconv("sあc漢g", 'utf-8', 'sjis')
+      try
+        let &encoding = 'sjis'
+        let res = JSON.decode('"sあc漢g"')
+      finally
+        let &encoding = 'utf-8'
+      endtry
+      Assert Equals(res, expected_sjis)
     End
 
     It decodes lists
@@ -115,7 +130,25 @@ Describe Web.JSON
       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
+      " multibyte
+      Assert Equals(JSON.encode("s¢cĴgё"), '"s¢cĴgё"')
+    End
+
+    It encodes strings with character encoding
+      let str_utf8 = "sあc漢g"
+      Assert Equals(JSON.encode(str_utf8), '"sあc漢g"')
+
+      let str_sjis = iconv("sあc漢g", 'utf-8', 'sjis')
+      try
+        let &encoding = 'sjis'
+        let res = JSON.encode(str_sjis)
+      finally
+        let &encoding = 'utf-8'
+      endtry
+      Assert Equals(res, '"sあc漢g"')
+
+      let s = { 'from_encoding': 'sjis' }
+      Assert Equals(JSON.encode(str_sjis, s), '"sあc漢g"')
     End
 
     It encodes lists