json, feat: support encode BigInt.

Author: xicilion

fibjs/include/Buffer.h

@@ -112,7 +112,7 @@ class Buffer : public Buffer_base {
     virtual result_t toJSON(exlib::string key, v8::Local<v8::Value>& retVal);
 
 public:
-    static result_t fromJSON(Isolate* isolate, v8::Local<v8::Value> data, v8::Local<v8::Object>& o);
+    static result_t fromJSON(Isolate* isolate, v8::Local<v8::Value> data, v8::Local<v8::Value>& o);
 
     char* data()
     {

fibjs/src/base/Runtime.cpp

@@ -312,6 +312,17 @@ Isolate* Isolate::current()
     return rt->isolate();
 }
 
+static void BigInt_toJSON(const v8::FunctionCallbackInfo<v8::Value>& args)
+{
+    v8::Isolate* isolate = args.GetIsolate();
+    v8::Local<v8::Object> o = v8::Object::New(isolate);
+
+    o->Set(NewString(isolate, "type", 4), NewString(isolate, "BigInt", 6));
+    o->Set(NewString(isolate, "data", 4), args.This()->ToString(isolate));
+
+    args.GetReturnValue().Set(o);
+}
+
 void Isolate::init()
 {
     s_isolates.putTail(this);
@@ -332,6 +343,9 @@ void Isolate::init()
 
     _context->SetEmbedderData(1, v8::Object::New(m_isolate)->GetPrototype());
 
+    v8::Local<v8::Object> proto = v8::Local<v8::Object>::Cast(v8::Local<v8::Object>::Cast(v8::BigIntObject::New(m_isolate, 0))->GetPrototype());
+    proto->Set(NewString("toJSON"), NewFunction("toJSON", BigInt_toJSON));
+
     static const char* skips[] = { "Master", "repl", "argv", "__filename", "__dirname", NULL };
     global_base::class_info().Attach(this, _context->Global(), skips);
 

fibjs/src/encoding/encoding_json.cpp

@@ -16,11 +16,26 @@ namespace fibjs {
 
 DECLARE_MODULE(json);
 
+result_t BigInt_fromJSON(Isolate* isolate, v8::Local<v8::Value> data, v8::Local<v8::Value>& retVal)
+{
+    TryCatch try_catch;
+
+    v8::MaybeLocal<v8::BigInt> v = data->ToBigInt(isolate->context());
+    try_catch.Reset();
+
+    if (v.IsEmpty())
+        return CALL_E_TYPEMISMATCH;
+
+    retVal = v.ToLocalChecked();
+    return 0;
+}
+
 struct _from {
     const char* name;
-    result_t (*from)(Isolate*, v8::Local<v8::Value>, v8::Local<v8::Object>&);
+    result_t (*from)(Isolate*, v8::Local<v8::Value>, v8::Local<v8::Value>&);
 } s_from[] = {
     { "Buffer", Buffer::fromJSON },
+    { "BigInt", BigInt_fromJSON },
     { NULL }
 };
 
@@ -315,9 +330,9 @@ inline result_t _jsonDecode(exlib::string data,
 
                     for (i = 0; s_from[i].name; i++)
                         if (!qstrcmp(*str, s_from[i].name)) {
-                            hr = s_from[i].from(isolate, data, json_object);
-                            if (hr < 0)
-                                return hr;
+                            hr = s_from[i].from(isolate, data, retVal);
+                            if (hr >= 0)
+                                return 0;
                             break;
                         }
                 }

fibjs/src/global/Buffer.cpp

@@ -1156,7 +1156,7 @@ result_t Buffer::toJSON(exlib::string key, v8::Local<v8::Value>& retVal)
     return 0;
 }
 
-result_t Buffer::fromJSON(Isolate* isolate, v8::Local<v8::Value> data, v8::Local<v8::Object>& o)
+result_t Buffer::fromJSON(Isolate* isolate, v8::Local<v8::Value> data, v8::Local<v8::Value>& o)
 {
     result_t hr;
     v8::Local<v8::Array> arr;

test/encoding_test.js

@@ -254,7 +254,9 @@ describe('encoding', () => {
 
         assert.equal(json.encode(json.decode('{"a":100,"b":200}')),
             '{"a":100,"b":200}');
+    });
 
+    it('json encode object', () => {
         var buf = new Buffer('test');
         var j = json.encode(buf);
         assert.equal(j, '{"type":"Buffer","data":[116,101,115,116]}');
@@ -272,6 +274,40 @@ describe('encoding', () => {
         }));
 
         assert.deepEqual(buf, buf1);
+
+        var o = {
+            "type": "Buffer",
+            "data": {
+                a: 100,
+                b: 200
+            }
+        };
+        assert.deepEqual(json.decode(json.encode(o)), o)
+
+        var o = {
+            bigint: 10000n
+        };
+
+        var j = json.encode(o);
+        assert.equal(j, '{"bigint":{"type":"BigInt","data":"10000"}}')
+
+        var o1 = json.decode(j);
+        assert.deepEqual(o, o1);
+
+        var o = {
+            "type": "BigInt",
+            "data": "aaaaa"
+        };
+        assert.deepEqual(json.decode(json.encode(o)), o)
+
+        var o = {
+            "type": "BigInt",
+            "data": {
+                a: 100,
+                b: 200
+            }
+        };
+        assert.deepEqual(json.decode(json.encode(o)), o)
     });
 
     it('json encode error when circular', () => {