@cascateer/core 2.3.23 → 2.3.25

package/package.json

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

package/src/serializable.ts

@@ -25,19 +25,29 @@ export abstract class Serializable<O> {
     SerializableConstructor<unknown, unknown>
   > = {};
 
-  static async fromJSON<T, O>(json: string): Promise<T> {
+  static fromJSON<T, O>(json: string): T {
     const { $ref, value }: SerializerResult<O> = JSON.parse(json),
-      [url, path] = $ref.split(/#\/?/);
-
-    if (url != null && path != null) {
-      return import(url).then((module) =>
-        (
-          get(module, path.split("/")) as SerializableConstructor<T, O>
-        ).fromObject(value),
-      );
+      [url, pointer] = $ref.split(/#\/?/);
+
+    console.log({
+      url,
+      pointer,
+      path: pointer?.split("/"),
+      name: Serializable.name,
+      got: get(Serializable, pointer?.split("/").slice(1) ?? []),
+    });
+
+    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);
+      }
     }
 
-    throw new Error(`${json} deserialization failed`);
+    return JSON.parse(json);
   }
 
   static toJSON<T, O>(
@@ -55,36 +65,9 @@ export abstract class Serializable<O> {
     }));
   }
 
-  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;
-              }
-
-              console.log(value, node);
-
-              return value;
-            }),
-        ),
-      Promise.resolve(obj),
+  static parse(text: string) {
+    return JSON.parse(text, (_, value) =>
+      Serializable.fromJSON(JSON.stringify(value)),
     );
   }
 

package/src/store.ts

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

package/src/serializable.spec.ts

@@ -1,32 +0,0 @@
-import { BrandedSerializer, Serializable } from "./serializable";
-
-interface SquareObject {
-  x: number;
-  y: number;
-}
-
-export interface Square extends SquareObject {}
-
-export class Square implements Serializable<SquareObject> {
-  constructor({ x, y }: SquareObject) {
-    this.x = x;
-    this.y = y;
-  }
-
-  static fromObject(obj: SquareObject): Square {
-    return new Square(obj);
-  }
-
-  toObject(): SquareObject {
-    return {
-      x: this.x,
-      y: this.y,
-    };
-  }
-
-  toJSON: BrandedSerializer<SquareObject> = Serializable.toJSON(Square, this);
-}
-
-Serializable.fromJSON<Square, SquareObject>(
-  JSON.stringify(new Square({ x: 2, y: 24 })),
-).then(console.log);