Cleaned up and fixed up GetRefFields

3 files changed, 49 insertions, 99 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index fc39fa364..87a87be92 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -124,13 +124,12 @@ export namespace DocServer {
             // future .proto calls on the Doc won't have to go farther than the cache to get their actual value.
             const deserializeField = getSerializedField.then(async fieldJson => {
                 // deserialize
-                const field = await SerializationHelper.Deserialize(fieldJson, val => {
-                    if (val !== undefined) {
-                        _cache[id] = val;
-                    } else {
-                        delete _cache[id];
-                    }
-                });
+                const field = await SerializationHelper.Deserialize(fieldJson);
+                if (field !== undefined) {
+                    _cache[id] = field;
+                } else {
+                    delete _cache[id];
+                }
                 return field;
                 // either way, overwrite or delete any promises cached at this id (that we inserted as flags
                 // to indicate that the field was in the process of being fetched). Now everything
@@ -214,36 +213,37 @@ export namespace DocServer {
         // future .proto calls on the Doc won't have to go farther than the cache to get their actual value.
         const deserializeFields = getSerializedFields.then(async fields => {
             const fieldMap: { [id: string]: RefField } = {};
-            // const protosToLoad: any = [];
-            const proms: Promise<RefField>[] = [];
+            const proms: Promise<void>[] = [];
             for (const field of fields) {
                 if (field !== undefined) {
                     // deserialize
-                    let prom = SerializationHelper.Deserialize(field, val => {
-                        if (val !== undefined) {
-                            _cache[field.id] = field;
+                    let prom = SerializationHelper.Deserialize(field).then(deserialized => {
+                        fieldMap[field.id] = deserialized;
+
+                        //overwrite or delete any promises (that we inserted as flags
+                        // to indicate that the field was in the process of being fetched). Now everything
+                        // should be an actual value within or entirely absent from the cache.
+                        if (deserialized !== undefined) {
+                            _cache[field.id] = deserialized;
                         } else {
                             delete _cache[field.id];
                         }
-                    }).then(deserialized => fieldMap[field.id] = deserialized);
-                    proms.push(prom);
+                        return deserialized;
+                    });
+                    // 4) here, for each of the documents we've requested *ourselves* (i.e. weren't promises or found in the cache)
+                    // we set the value at the field's id to a promise that will resolve to the field. 
+                    // When we find that promises exist at keys in the cache, THIS is where they were set, just by some other caller (method).
+                    // The mapping in the .then call ensures that when other callers await these promises, they'll
+                    // get the resolved field
+                    _cache[field.id] = prom;
                     // adds to a list of promises that will be awaited asynchronously
-                    // protosToLoad.push(deserialized.proto);
+                    proms.push(prom);
                 }
             }
             await Promise.all(proms);
-            // this actually handles the loading of prototypes
-            // await Promise.all(protosToLoad);
             return fieldMap;
         });
 
-        // 4) here, for each of the documents we've requested *ourselves* (i.e. weren't promises or found in the cache)
-        // we set the value at the field's id to a promise that will resolve to the field. 
-        // When we find that promises exist at keys in the cache, THIS is where they were set, just by some other caller (method).
-        // The mapping in the .then call ensures that when other callers await these promises, they'll
-        // get the resolved field
-        requestedIds.forEach(id => _cache[id] = deserializeFields.then(fields => fields[id]));
-
         // 5) at this point, all fields have a) been returned from the server and b) been deserialized into actual Field objects whose
         // prototype documents, if any, have also been fetched and cached.
         const fields = await deserializeFields;
@@ -253,14 +253,6 @@ export namespace DocServer {
         // id to the soon-to-be-returned field mapping.
         requestedIds.forEach(id => {
             const field = fields[id];
-            // either way, overwrite or delete any promises (that we inserted as flags
-            // to indicate that the field was in the process of being fetched). Now everything
-            // should be an actual value within or entirely absent from the cache.
-            if (field !== undefined) {
-                _cache[id] = field;
-            } else {
-                delete _cache[id];
-            }
             map[id] = field;
         });
 
diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts
index 13302be21..ff048f647 100644
--- a/src/client/util/SerializationHelper.ts
+++ b/src/client/util/SerializationHelper.ts
@@ -34,7 +34,7 @@ export namespace SerializationHelper {
         return json;
     }
 
-    export async function Deserialize(obj: any, cb: (val: any) => void = emptyFunction): Promise<any> {
+    export async function Deserialize(obj: any): Promise<any> {
         if (obj === undefined || obj === null) {
             return undefined;
         }
@@ -57,7 +57,7 @@ export namespace SerializationHelper {
         }
 
         const type = serializationTypes[obj.__type];
-        const value = await new Promise(res => cb(deserialize(type.ctor, obj, (err, result) => res(result))));
+        const value = await new Promise(res => deserialize(type.ctor, obj, (err, result) => res(result)));
         if (type.afterDeserialize) {
             await type.afterDeserialize(value);
         }
diff --git a/src/debug/Test.tsx b/src/debug/Test.tsx
index 0dca4b4b1..79f87f4ac 100644
--- a/src/debug/Test.tsx
+++ b/src/debug/Test.tsx
@@ -1,81 +1,39 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { SerializationHelper } from '../client/util/SerializationHelper';
-import { createSchema, makeInterface, makeStrictInterface, listSpec } from '../new_fields/Schema';
-import { ImageField } from '../new_fields/URLField';
+import { DocServer } from '../client/DocServer';
 import { Doc } from '../new_fields/Doc';
-import { List } from '../new_fields/List';
-
-const schema1 = createSchema({
-    hello: "number",
-    test: "string",
-    fields: "boolean",
-    url: ImageField,
-    testDoc: Doc
-});
-
-type TestDoc = makeInterface<[typeof schema1]>;
-const TestDoc: (doc?: Doc) => TestDoc = makeInterface(schema1);
-
-const schema2 = createSchema({
-    hello: ImageField,
-    test: "boolean",
-    fields: listSpec("number"),
-    url: "number",
-    testDoc: ImageField
-});
-
-const Test2Doc = makeStrictInterface(schema2);
-type Test2Doc = makeStrictInterface<typeof schema2>;
-
-const assert = (bool: boolean) => {
-    if (!bool) throw new Error();
-};
 
+const protoId = "protoDoc";
+const delegateId = "delegateDoc";
 class Test extends React.Component {
-    onClick = () => {
-        const url = new ImageField(new URL("http://google.com"));
-        const doc = new Doc();
-        const doc2 = new Doc();
-        doc.hello = 5;
-        doc.fields = "test";
-        doc.test = "hello doc";
-        doc.url = url;
-        //doc.testDoc = doc2;
-
+    onCreateClick = () => {
+        const proto = new Doc(protoId, true);
+        const delegate = Doc.MakeDelegate(proto, delegateId);
+    }
 
-        const test1: TestDoc = TestDoc(doc);
-        assert(test1.hello === 5);
-        assert(test1.fields === undefined);
-        assert(test1.test === "hello doc");
-        assert(test1.url === url);
-        assert(test1.testDoc === doc2);
-        test1.myField = 20;
-        assert(test1.myField === 20);
+    onReadClick = async () => {
+        console.log("reading");
+        const docs = await DocServer.GetRefFields([delegateId, protoId]);
+        console.log("done");
+        console.log(docs);
+    }
 
-        const test2: Test2Doc = Test2Doc(doc);
-        assert(test2.hello === undefined);
-        // assert(test2.fields === "test");
-        assert(test2.test === undefined);
-        assert(test2.url === undefined);
-        assert(test2.testDoc === undefined);
-        test2.url = 35;
-        assert(test2.url === 35);
-        const l = new List<Doc>();
-        //TODO push, and other array functions don't go through the proxy
-        l.push(doc2);
-        //TODO currently length, and any other string fields will get serialized
-        doc.list = l;
-        console.log(l.slice());
+    onDeleteClick = () => {
+        DocServer.DeleteDocuments([protoId, delegateId]);
     }
 
     render() {
-        return <div><button onClick={this.onClick}>Click me</button>
-            {/* <input onKeyPress={this.onEnter}></input> */}
-        </div>;
+        return (
+            <div>
+                <button onClick={this.onCreateClick}>Create Docs</button>
+                <button onClick={this.onReadClick}>Read Docs</button>
+                <button onClick={this.onDeleteClick}>Delete Docs</button>
+            </div>
+        );
     }
 }
 
+DocServer.init(window.location.protocol, window.location.hostname, 4321, "test");
 ReactDOM.render(
     <Test />,
     document.getElementById('root')