From 9ed3efa205efde02e4046436e636a6515b001122 Mon Sep 17 00:00:00 2001
From: Yourim Cha <yourim.cha@navercorp.com>
Date: Mon, 30 Jan 2023 18:03:04 +0900
Subject: [PATCH 1/2] Add `toJS` property to the handler of ObjectProxy

---
 src/document/document.ts    | 4 ++--
 src/document/json/object.ts | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/document/document.ts b/src/document/document.ts
index 36e0fd2bc..006c8884b 100644
--- a/src/document/document.ts
+++ b/src/document/document.ts
@@ -401,14 +401,14 @@ export class Document<T> implements Observable<DocEvent> {
   }
 
   /**
-   * `toJSON` returns the JSON encoding of this array.
+   * `toJSON` returns the JSON encoding of this document.
    */
   public toJSON(): string {
     return this.root.toJSON();
   }
 
   /**
-   * `toJSON` returns the sorted JSON encoding of this array.
+   * `toSortedJSON` returns the sorted JSON encoding of this document.
    */
   public toSortedJSON(): string {
     return this.root.toSortedJSON();
diff --git a/src/document/json/object.ts b/src/document/json/object.ts
index 75d405975..9cb34da34 100644
--- a/src/document/json/object.ts
+++ b/src/document/json/object.ts
@@ -96,6 +96,10 @@ export class ObjectProxy {
           return (): string => {
             return target.toJSON();
           };
+        } else if (keyOrMethod === 'toJS') {
+          return (): object => {
+            return target.toJS();
+          };
         }
 
         return toJSONElement(context, target.get(keyOrMethod));

From 14ba73547f221abb2f486835847d62ec0721f337 Mon Sep 17 00:00:00 2001
From: Yourim Cha <yourim.cha@navercorp.com>
Date: Tue, 31 Jan 2023 12:20:31 +0900
Subject: [PATCH 2/2] Add toJS test

---
 src/document/document.ts        |  2 +-
 src/document/json/object.ts     |  5 +++++
 test/integration/object_test.ts | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/document/document.ts b/src/document/document.ts
index 006c8884b..98f24918e 100644
--- a/src/document/document.ts
+++ b/src/document/document.ts
@@ -363,7 +363,7 @@ export class Document<T> implements Observable<DocEvent> {
   /**
    * `getRoot` returns a new proxy of cloned root.
    */
-  public getRoot(): T {
+  public getRoot(): JSONObject<T> {
     this.ensureClone();
 
     const context = ChangeContext.create(this.changeID.next(), this.clone!);
diff --git a/src/document/json/object.ts b/src/document/json/object.ts
index 9cb34da34..1ed9f8fb2 100644
--- a/src/document/json/object.ts
+++ b/src/document/json/object.ts
@@ -48,6 +48,11 @@ export type JSONObject<T> = {
    * `toJSON` returns the JSON encoding of this object.
    */
   toJSON?(): string;
+
+  /**
+   * `toJS` returns the JSON object of this object.
+   */
+  toJS?(): T;
 } & T;
 
 /**
diff --git a/test/integration/object_test.ts b/test/integration/object_test.ts
index 22e4bb7ab..c7f7d704c 100644
--- a/test/integration/object_test.ts
+++ b/test/integration/object_test.ts
@@ -1,4 +1,5 @@
 import { assert } from 'chai';
+import { JSONObject } from '@yorkie-js-sdk/src/yorkie';
 import { DocEventType, Document } from '@yorkie-js-sdk/src/document/document';
 import { withTwoClientsAndDocuments } from '@yorkie-js-sdk/test/integration/integration_helper';
 
@@ -76,6 +77,22 @@ describe('Object', function () {
     assert.equal('{"k1":{"k1-2":"v2","k1-3":"v4"}}', doc.toSortedJSON());
   });
 
+  it('should support toJS and toJSON methods', function () {
+    const doc = Document.create<{
+      content: JSONObject<{ a: number; b: number; c: number }>;
+    }>('test-doc');
+    doc.update((root) => {
+      root.content = { a: 1, b: 2, c: 3 };
+    }, 'set a, b, c');
+    assert.equal(doc.toSortedJSON(), '{"content":{"a":1,"b":2,"c":3}}');
+
+    const root = doc.getRoot();
+    assert.equal(root.toJSON!(), '{"content":{"a":1,"b":2,"c":3}}');
+    assert.deepEqual(root.toJS!(), { content: { a: 1, b: 2, c: 3 } });
+    assert.equal(root.content.toJSON!(), '{"a":1,"b":2,"c":3}');
+    assert.deepEqual(root.content.toJS!(), { a: 1, b: 2, c: 3 });
+  });
+
   it('Object.keys, Object.values and Object.entries test', function () {
     const doc = Document.create<{
       content: { a: number; b: number; c: number };