Merge branch 'gh-pages' of https://github.com/LivelyKernel/lively4-core into gh-pages

Author: JensLincke

src/client/serialize.js

@@ -9,7 +9,14 @@ export function serialize(obj) {
         // 1st occurence: remember you saw that one
         const id = uuid();
         references.set(value, id);
-        return Object.assign({ $id: id }, value);
+        const result = Object.assign({ $id: id }, value);
+        
+        const classToRemember = value.__proto__.constructor;
+        if (classToRemember !== Object) {
+          result.$class = classToRemember.name;
+        }
+        
+        return result;
       } else {
         return { $ref: references.get(value) };
       }
@@ -25,24 +32,37 @@ export function deserialize(json, classes = {}) {
   const idToObj = new Map();
 
   function reviver(key, value) {
-    if (value && value.$ref) {
+    if (!value) {
+      return value;
+    }
+
+    if (value.$ref) {
       return idToObj.getOrCreate(value.$ref, () => ({}));
     }
 
-    if (value && value.$id) {
+    if (value.$id) {
       const id = value.$id;
       delete value.$id;
 
       if (idToObj.has(id)) {
         const proxy = idToObj.get(id);
 
-        return Object.assign(proxy, value);
+        value = Object.assign(proxy, value);
       } else {
         idToObj.set(id, value);
-        return value;
       }
     }
 
+    if (value.$class) {
+      const className = value.$class;
+      delete value.$class;
+      
+      const classToRestore = classes[className];
+      if (classToRestore) {
+        value.migrateTo(classToRestore);
+      }
+    }
+    
     return value;
   }
 

test/serialize-test.js

@@ -7,10 +7,6 @@ const assert = chai.assert;
 
 import { serialize, deserialize } from 'src/client/serialize.js';
 
-function isACopy(a, b) {
-  
-}
-
 describe('simple serialization with JSON.{parse,stringify}', () => {
 
   it('exports defined', () => {
@@ -80,4 +76,22 @@ describe('simple serialization with JSON.{parse,stringify}', () => {
     expect(o2).not.to.have.property('$ref');
   });
 
+  it('restore classes and clean up $class', () => {
+    class A {
+      get foo() { return 42; }
+    }
+    class B {
+      get foo() { return 42; }
+    }
+    const a = new A();
+    a.b = new B();
+    a.b.a = a;
+    const a2 = deserialize(serialize(a), { A, B });
+
+    expect(a).not.to.have.property('$class');
+    expect(a2).not.to.have.property('$class');
+    expect(a2 instanceof A).to.be.true;
+    expect(a2.b instanceof B).to.be.true;
+  });
+
 });