Move deserialize methods to be standalones instead of static members

Author: tristan-huber

packages/replicad/src/draw.ts

@@ -1,7 +1,7 @@
 import {
   ApproximationOptions,
   BoundingBox2d,
-  Curve2D,
+  deserializeCurve2D,
   make2dCircle,
   make2dEllipse,
   make2dInerpolatedBSplineCurve,
@@ -84,29 +84,6 @@ export class Drawing implements DrawingInterface {
     return JSON.stringify(serializeHelper(this.innerShape));
   }
 
-  static deserializeDrawing(data: string): Drawing {
-    function deserializeHelper(json: any): Shape2D {
-      if (json["type"] === "CompoundBlueprint") {
-        const blueprints = json["blueprints"].map(deserializeHelper);
-        return new CompoundBlueprint(blueprints);
-      } else if (json["type"] === "Blueprints") {
-        const blueprints = json["blueprints"].map(deserializeHelper);
-        return new Blueprints(blueprints);
-      } else if (json["type"] === "Blueprint") {
-        const curves = json["curves"].map((c: string) =>
-          Curve2D.deserializeCurve(c)
-        );
-        return new Blueprint(curves);
-      } else {
-        throw new Error("Unknown shape type for deserialization");
-      }
-    }
-
-    const json = JSON.parse(data);
-    const shape = deserializeHelper(json);
-    return new Drawing(shape);
-  }
-
   get boundingBox(): BoundingBox2d {
     if (!this.innerShape) return new BoundingBox2d();
     return this.innerShape.boundingBox;
@@ -304,6 +281,31 @@ export class DrawingPen
   }
 }
 
+/**
+ * Deserializes a drawing from a string. String is expected to be in the format
+ * generated by `Drawing.serialize()`.
+ */
+export function deserializeDrawing(data: string): Drawing {
+  function deserializeHelper(json: any): Shape2D {
+    if (json["type"] === "CompoundBlueprint") {
+      const blueprints = json["blueprints"].map(deserializeHelper);
+      return new CompoundBlueprint(blueprints);
+    } else if (json["type"] === "Blueprints") {
+      const blueprints = json["blueprints"].map(deserializeHelper);
+      return new Blueprints(blueprints);
+    } else if (json["type"] === "Blueprint") {
+      const curves = json["curves"].map((c: string) => deserializeCurve2D(c));
+      return new Blueprint(curves);
+    } else {
+      throw new Error("Unknown shape type for deserialization");
+    }
+  }
+
+  const json = JSON.parse(data);
+  const shape = deserializeHelper(json);
+  return new Drawing(shape);
+}
+
 /**
  * Creates a drawing pen to programatically draw in 2D.
  *

packages/replicad/src/lib2d/Curve2D.ts

@@ -16,6 +16,12 @@ import { pnt } from "./ocWrapper.js";
 import { reprPnt } from "./utils.js";
 import { distance2d, samePoint } from "./vectorOperations.js";
 
+export function deserializeCurve2D(data: string): Curve2D {
+  const oc = getOC();
+  const handle = oc.GeomToolsWrapper.Read(data);
+  return new Curve2D(handle);
+}
+
 export class Curve2D extends WrappingObj<Handle_Geom2d_Curve> {
   _boundingBox: null | BoundingBox2d;
   constructor(handle: Handle_Geom2d_Curve) {
@@ -53,12 +59,6 @@ export class Curve2D extends WrappingObj<Handle_Geom2d_Curve> {
     return oc.GeomToolsWrapper.Write(this.wrapped);
   }
 
-  static deserializeCurve(data: string): Curve2D {
-    const oc = getOC();
-    const handle = oc.GeomToolsWrapper.Read(data);
-    return new Curve2D(handle);
-  }
-
   value(parameter: number): Point2D {
     const pnt = this.innerCurve.Value(parameter);
     const vec: Point2D = [pnt.X(), pnt.Y()];

packages/replicad/src/shapes.ts

@@ -203,6 +203,11 @@ export const shapeType = (shape: TopoDS_Shape): TopAbs_ShapeEnum => {
   return shape.ShapeType();
 };
 
+export function deserializeShape(data: string): Shape<TopoDS_Shape> {
+  const oc = getOC();
+  return new Shape(oc.BRepToolsWrapper.Read(data));
+}
+
 export class Shape<Type extends TopoDS_Shape> extends WrappingObj<Type> {
   constructor(ocShape: Type) {
     super(ocShape);
@@ -217,11 +222,6 @@ export class Shape<Type extends TopoDS_Shape> extends WrappingObj<Type> {
     return oc.BRepToolsWrapper.Write(this.wrapped);
   }
 
-  static deserializeShape(data: string): Shape<TopoDS_Shape> {
-    const oc = getOC();
-    return new Shape(oc.BRepToolsWrapper.Read(data));
-  }
-
   get hashCode(): number {
     return this.wrapped.HashCode(HASH_CODE_MAX);
   }