Fixed a some bugs about the persistence

OpenMarshal · May 21, 2017 · 0d1c7c1 · 0d1c7c1
1 parent 4526ad7
commit 0d1c7c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/manager/ISerializer.d.ts b/lib/manager/ISerializer.d.ts
@@ -0,0 +1,15 @@
+import { IResource, ResourceType } from '../resource/IResource';
+import { FSManager } from './FSManager';
+export declare class SerializedObject {
+    data: any;
+    type: ResourceType;
+    children: SerializedObject[];
+    managerUID: string;
+    constructor(managerUID: string, type: ResourceType);
+}
+export interface ISerializer {
+    serialize(resource: IResource, obj: SerializedObject): object;
+    unserialize(data: any, obj: SerializedObject): IResource;
+}
+export declare function unserialize(obj: SerializedObject, managers: FSManager[], callback: (error: Error, rootResource: IResource) => void): void;
+export declare function serialize(resource: IResource, callback: (error: Error, obj: SerializedObject) => void): void;
diff --git a/lib/manager/ISerializer.js b/lib/manager/ISerializer.js
@@ -49,7 +49,6 @@ function unserialize(obj, managers, callback) {
 }
 exports.unserialize = unserialize;
 function serialize(resource, callback) {
-    var _this = this;
     resource.type(function (e, type) {
         var obj = new SerializedObject(resource.fsManager.uid, type);
         obj.data = resource.fsManager.serialize(resource, obj);
@@ -80,7 +79,7 @@ function serialize(resource, callback) {
                 if (nb === 0)
                     callback(null, obj);
             }
-            children.forEach(function (c) { return _this.serialize(c, go); });
+            children.forEach(function (c) { return serialize(c, go); });
         });
     });
 }

diff --git a/src/manager/ISerializer.ts b/src/manager/ISerializer.ts
@@ -22,7 +22,7 @@ export interface ISerializer
     unserialize(data : any, obj : SerializedObject) : IResource;
 }
 
-export function unserialize(obj : SerializedObject, managers : FSManager[], callback : (error : Error, rootResource : IResource))
+export function unserialize(obj : SerializedObject, managers : FSManager[], callback : (error : Error, rootResource : IResource) => void)
 {
     for(const m of managers)
         if(m.uid === obj.managerUID)
@@ -102,7 +102,7 @@ export function serialize(resource : IResource, callback : (error : Error, obj :
                 if(nb === 0)
                     callback(null, obj);
             }
-            children.forEach((c) => this.serialize(c, go));
+            children.forEach((c) => serialize(c, go));
         })
     })
 }