brepjs 3.0.2 → 4.0.3

package/dist/brepjs.cjs

@@ -1109,9 +1109,16 @@ function andThen(result, fn) {
   return result;
 }
 const flatMap = andThen;
+function formatError(error) {
+  if (typeof error === "object" && error !== null && "kind" in error && "code" in error && "message" in error) {
+    const e = error;
+    return `[${e.kind}] ${e.code}: ${e.message}`;
+  }
+  return String(error);
+}
 function unwrap(result) {
   if (result.ok) return result.value;
-  throw new Error(`Called unwrap() on an Err: ${String(result.error)}`);
+  throw new Error(`Called unwrap() on an Err: ${formatError(result.error)}`);
 }
 function unwrapOr(result, defaultValue) {
   if (result.ok) return result.value;
@@ -1977,8 +1984,9 @@ function deserializeShape(data) {
   return cast(oc.BRepToolsWrapper.Read(data));
 }
 function isShape3DInternal(shape) {
-  const name = shape.constructor.name;
-  return name === "Shell" || name === "Solid" || name === "CompSolid" || name === "Compound";
+  const shapeTypeRaw = shape.wrapped?.ShapeType?.();
+  const shapeType2 = typeof shapeTypeRaw === "object" && shapeTypeRaw !== null ? shapeTypeRaw.value : shapeTypeRaw;
+  return typeof shapeType2 === "number" && shapeType2 <= 3;
 }
 function buildCompoundOc(shapes) {
   const oc = getKernel().oc;
@@ -2012,9 +2020,29 @@ function fuseAll$2(shapes, { optimisation = "none", simplify: simplify2 = false,
       shapes.map((s) => s.wrapped),
       { optimisation, simplify: simplify2, strategy }
     );
+    const shapeTypeEnumRaw = result.ShapeType?.();
+    const shapeTypeEnum = typeof shapeTypeEnumRaw === "object" && shapeTypeEnumRaw !== null ? shapeTypeEnumRaw.value : shapeTypeEnumRaw;
+    const typeNames = [
+      "COMPOUND",
+      "COMPSOLID",
+      "SOLID",
+      "SHELL",
+      "FACE",
+      "WIRE",
+      "EDGE",
+      "VERTEX",
+      "SHAPE"
+    ];
+    const rawTypeName = typeof shapeTypeEnum === "number" ? typeNames[shapeTypeEnum] ?? `UNKNOWN(${shapeTypeEnum})` : "UNKNOWN";
     return andThen(cast(result), (newShape) => {
-      if (!isShape3DInternal(newShape))
-        return err(typeCastError("FUSE_ALL_NOT_3D", "fuseAll did not produce a 3D shape"));
+      if (!isShape3DInternal(newShape)) {
+        return err(
+          typeCastError(
+            "FUSE_ALL_NOT_3D",
+            `fuseAll did not produce a 3D shape. Got ${rawTypeName} (${newShape.constructor.name}) instead.`
+          )
+        );
+      }
       return ok(newShape);
     });
   }
@@ -3869,8 +3897,21 @@ function buildCompoundOcInternal(shapes) {
 function castToShape3D(shape, errorCode, errorMsg) {
   const wrapped = castShape(shape);
   if (!isShape3D(wrapped)) {
+    const shapeType2 = shape.ShapeType();
+    const typeNames = [
+      "COMPOUND",
+      "COMPSOLID",
+      "SOLID",
+      "SHELL",
+      "FACE",
+      "WIRE",
+      "EDGE",
+      "VERTEX",
+      "SHAPE"
+    ];
+    const typeName = typeNames[shapeType2] ?? `UNKNOWN(${shapeType2})`;
     wrapped[Symbol.dispose]();
-    return err(typeCastError(errorCode, errorMsg));
+    return err(typeCastError(errorCode, `${errorMsg}. Got ${typeName} instead.`));
   }
   return ok(wrapped);
 }

package/dist/brepjs.js

@@ -1107,9 +1107,16 @@ function andThen(result, fn) {
   return result;
 }
 const flatMap = andThen;
+function formatError(error) {
+  if (typeof error === "object" && error !== null && "kind" in error && "code" in error && "message" in error) {
+    const e = error;
+    return `[${e.kind}] ${e.code}: ${e.message}`;
+  }
+  return String(error);
+}
 function unwrap(result) {
   if (result.ok) return result.value;
-  throw new Error(`Called unwrap() on an Err: ${String(result.error)}`);
+  throw new Error(`Called unwrap() on an Err: ${formatError(result.error)}`);
 }
 function unwrapOr(result, defaultValue) {
   if (result.ok) return result.value;
@@ -1975,8 +1982,9 @@ function deserializeShape(data) {
   return cast(oc.BRepToolsWrapper.Read(data));
 }
 function isShape3DInternal(shape) {
-  const name = shape.constructor.name;
-  return name === "Shell" || name === "Solid" || name === "CompSolid" || name === "Compound";
+  const shapeTypeRaw = shape.wrapped?.ShapeType?.();
+  const shapeType2 = typeof shapeTypeRaw === "object" && shapeTypeRaw !== null ? shapeTypeRaw.value : shapeTypeRaw;
+  return typeof shapeType2 === "number" && shapeType2 <= 3;
 }
 function buildCompoundOc(shapes) {
   const oc = getKernel().oc;
@@ -2010,9 +2018,29 @@ function fuseAll$2(shapes, { optimisation = "none", simplify: simplify2 = false,
       shapes.map((s) => s.wrapped),
       { optimisation, simplify: simplify2, strategy }
     );
+    const shapeTypeEnumRaw = result.ShapeType?.();
+    const shapeTypeEnum = typeof shapeTypeEnumRaw === "object" && shapeTypeEnumRaw !== null ? shapeTypeEnumRaw.value : shapeTypeEnumRaw;
+    const typeNames = [
+      "COMPOUND",
+      "COMPSOLID",
+      "SOLID",
+      "SHELL",
+      "FACE",
+      "WIRE",
+      "EDGE",
+      "VERTEX",
+      "SHAPE"
+    ];
+    const rawTypeName = typeof shapeTypeEnum === "number" ? typeNames[shapeTypeEnum] ?? `UNKNOWN(${shapeTypeEnum})` : "UNKNOWN";
     return andThen(cast(result), (newShape) => {
-      if (!isShape3DInternal(newShape))
-        return err(typeCastError("FUSE_ALL_NOT_3D", "fuseAll did not produce a 3D shape"));
+      if (!isShape3DInternal(newShape)) {
+        return err(
+          typeCastError(
+            "FUSE_ALL_NOT_3D",
+            `fuseAll did not produce a 3D shape. Got ${rawTypeName} (${newShape.constructor.name}) instead.`
+          )
+        );
+      }
       return ok(newShape);
     });
   }
@@ -3867,8 +3895,21 @@ function buildCompoundOcInternal(shapes) {
 function castToShape3D(shape, errorCode, errorMsg) {
   const wrapped = castShape(shape);
   if (!isShape3D(wrapped)) {
+    const shapeType2 = shape.ShapeType();
+    const typeNames = [
+      "COMPOUND",
+      "COMPSOLID",
+      "SOLID",
+      "SHELL",
+      "FACE",
+      "WIRE",
+      "EDGE",
+      "VERTEX",
+      "SHAPE"
+    ];
+    const typeName = typeNames[shapeType2] ?? `UNKNOWN(${shapeType2})`;
     wrapped[Symbol.dispose]();
-    return err(typeCastError(errorCode, errorMsg));
+    return err(typeCastError(errorCode, `${errorMsg}. Got ${typeName} instead.`));
   }
   return ok(wrapped);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brepjs",
-  "version": "3.0.2",
+  "version": "4.0.3",
   "description": "Web CAD library built on OpenCascade",
   "keywords": [
     "cad",