@cascateer/core 2.3.28 → 2.3.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.3.28",
+  "version": "2.3.30",
   "repository": {
     "type": "git",
     "url": "https://github.com/cascateer/core.git"

package/src/serializable.ts

@@ -25,23 +25,21 @@ export abstract class Serializable<O> {
     SerializableConstructor<unknown, unknown>
   > = {};
 
-  static fromJSON<T, O>(json: string): T {
-    try {
-      const { $ref, value }: SerializerResult<O> = JSON.parse(json),
-        [url, pointer] = $ref.split(/#\/?/);
-
-      if (url === import.meta.url && pointer != null) {
-        const path = pointer.split("/");
-
-        if (path[0] === Serializable.name) {
-          return (
-            get(Serializable, path.slice(1)) as SerializableConstructor<T, O>
-          ).fromObject(value);
-        }
-      }
-    } catch {}
+  static async fromJSON<T, O>(json: string): Promise<T> {
+    const { $ref, value }: SerializerResult<O> = JSON.parse(json),
+      [url, path] = $ref.split(/#\/?/);
+
+    console.log("fromJSON", url, this);
 
-    return JSON.parse(json);
+    if (url != null && path != null) {
+      return import(url).then((module) =>
+        (
+          get(module, path.split("/")) as SerializableConstructor<T, O>
+        ).fromObject(value),
+      );
+    }
+
+    throw new Error(`${json} deserialization failed`);
   }
 
   static toJSON<T, O>(
@@ -53,15 +51,42 @@ export abstract class Serializable<O> {
 
     this[importMap][id] = ctor;
 
+    console.log("toJSON", import.meta.url, this);
+
     return identity<BrandedSerializer<O>>(() => ({
       value: value.toObject(),
       $ref: [`${import.meta.url}#`, this.name, importMap, id].join("/"),
     }));
   }
 
-  static parse(text: string) {
-    return JSON.parse(text, (_, value) =>
-      Serializable.fromJSON(JSON.stringify(value)),
+  static async parse(text: string) {
+    const nodes: { key: string; value: any; parent?: any }[] = [];
+    const obj = JSON.parse(text, (key, value) => {
+      for (const node of nodes) {
+        if (value[node.key] === node.value) {
+          node.parent = value;
+        }
+      }
+
+      nodes.push({ key, value });
+
+      return value;
+    });
+
+    return nodes.reduce(
+      (value, node) =>
+        value.then(() =>
+          Serializable.fromJSON(JSON.stringify(node.value))
+            .catch(() => node.value)
+            .then((value) => {
+              if (node.parent != null) {
+                node.parent[node.key] = value;
+              }
+
+              return value;
+            }),
+        ),
+      Promise.resolve(obj),
     );
   }
 

package/src/store.ts

@@ -171,14 +171,15 @@ export class StoreProvider<Data> extends ExtendableStoreAdapter<
     >();
     const seedActions: Observable<MulticastAction<Data, "seedAction">> =
       actions.pipe(
-        flatMap((event) =>
+        mergeMap(async (event) =>
           event.type === "seedAction"
             ? {
                 ...event,
-                predicate: constant(Serializable.parse(event.data.seed)),
+                predicate: constant(await Serializable.parse(event.data.seed)),
               }
             : [],
         ),
+        flatMap(identity),
       );
 
     const callbacks = new Map<string, UnaryFunction<unknown, void>>();
@@ -212,7 +213,7 @@ export class StoreProvider<Data> extends ExtendableStoreAdapter<
                     return {
                       ...event,
                       predicate: transform(
-                        Serializable.parse(event.data.args ?? null),
+                        await Serializable.parse(event.data.args ?? null),
                       ),
                       callback: callbacks.get(event.id),
                     };