@cascateer/core 2.3.6 → 2.3.8

package/package.json

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

package/src/serializable.ts

@@ -1,8 +1,11 @@
-import { assign, Dictionary, get, isObject, isString } from "lodash";
+import { Dictionary, get } from "lodash";
 import { Brand, identity } from "ts-brand";
 import { v4 } from "uuid";
 
-type SerializerResult<O> = O & { $ref: string };
+interface SerializerResult<O> {
+  value: O;
+  $ref: string;
+}
 
 export interface Serializer<O> {
   (): SerializerResult<O>;
@@ -22,22 +25,20 @@ export abstract class Serializable<O> {
     SerializableConstructor<unknown, unknown>
   > = {};
 
-  static async fromJSON<T, O>(value: string): Promise<T> {
-    const obj: O = JSON.parse(value);
+  static async fromJSON<T, O>(json: string): Promise<T> {
+    const { $ref, value }: SerializerResult<O> = JSON.parse(json);
 
-    if (isObject(obj) && "$ref" in obj && isString(obj.$ref)) {
-      const [url, path] = obj.$ref.split(/#\/?/);
+    const [url, path] = $ref.split(/#\/?/);
 
-      if (url != null && path != null) {
-        return import(url).then((module) =>
-          (
-            get(module, path.split("/")) as SerializableConstructor<T, O>
-          ).fromObject(obj),
-        );
-      }
+    if (url != null && path != null) {
+      return import(url).then((module) =>
+        (
+          get(module, path.split("/")) as SerializableConstructor<T, O>
+        ).fromObject(value),
+      );
     }
 
-    throw new Error(`${value} deserialization failed`);
+    throw new Error(`${json} deserialization failed`);
   }
 
   static toJSON<T, O>(
@@ -49,12 +50,10 @@ export abstract class Serializable<O> {
 
     this[importMap][id] = ctor;
 
-    return identity<BrandedSerializer<O>>(
-      () =>
-        assign(value.toObject(), {
-          $ref: [`${import.meta.url}#`, this.name, importMap, id].join("/"),
-        }) as SerializerResult<O>,
-    );
+    return identity<BrandedSerializer<O>>(() => ({
+      value: value.toObject(),
+      $ref: [`${import.meta.url}#`, this.name, importMap, id].join("/"),
+    }));
   }
 
   abstract toObject(): O;