brepjs 8.8.7 → 8.8.8

package/dist/brepjs.cjs

@@ -245,10 +245,11 @@ function surfaceFromGrid(heights, options = {}) {
   }
 }
 function buildBSplineSurface(heights, rows, cols, dx, dy, scaleZ) {
-  const oc = occtBoundary.getKernel().oc;
-  const OC = oc;
-  const pntArray = new OC.TColgp_Array2OfPnt_2(1, rows, 1, cols);
+  var _stack = [];
   try {
+    const oc = occtBoundary.getKernel().oc;
+    const scope = __using(_stack, new shapeTypes.DisposalScope());
+    const pntArray = scope.register(new oc.TColgp_Array2OfPnt_2(1, rows, 1, cols));
     for (let r = 0; r < rows; r++) {
       for (let c = 0; c < cols; c++) {
         const row = heights[r];
@@ -258,33 +259,24 @@ function buildBSplineSurface(heights, rows, cols, dx, dy, scaleZ) {
         pnt.delete();
       }
     }
-    const fitter = new OC.GeomAPI_PointsToBSplineSurface_2(pntArray, 3, 8, 0, 1e-3);
+    const fitter = scope.register(new oc.GeomAPI_PointsToBSplineSurface_2(pntArray, 3, 8, 0, 1e-3));
     const surface = fitter.Surface();
-    const faceMaker = new OC.BRepBuilderAPI_MakeFace_8(surface, 1e-6);
-    let result2;
+    const faceMaker = scope.register(new oc.BRepBuilderAPI_MakeFace_8(surface, 1e-6));
     if (faceMaker.IsDone()) {
       const shape2 = shapeTypes.castShape(faceMaker.Face());
       if (shapeTypes.isFace(shape2)) {
-        result2 = errors.ok(shape2);
-      } else {
-        shape2[Symbol.dispose]();
-        result2 = errors.err(
-          errors.occtError(errors.BrepErrorCode.SURFACE_FAILED, "B-spline surface did not produce a face")
-        );
+        return errors.ok(shape2);
       }
-    } else {
-      result2 = errors.err(
-        errors.occtError(
-          errors.BrepErrorCode.SURFACE_FAILED,
-          "BRepBuilderAPI_MakeFace failed for B-spline surface"
-        )
-      );
+      shape2[Symbol.dispose]();
+      return errors.err(errors.occtError(errors.BrepErrorCode.SURFACE_FAILED, "B-spline surface did not produce a face"));
     }
-    faceMaker.delete();
-    fitter.delete();
-    return result2;
+    return errors.err(
+      errors.occtError(errors.BrepErrorCode.SURFACE_FAILED, "BRepBuilderAPI_MakeFace failed for B-spline surface")
+    );
+  } catch (_) {
+    var _error = _, _hasError = true;
   } finally {
-    pntArray.delete();
+    __callDispose(_stack, _error, _hasError);
   }
 }
 function buildTriangulatedSurface(heights, rows, cols, dx, dy, scaleZ) {

package/dist/brepjs.js

@@ -258,10 +258,11 @@ function surfaceFromGrid(heights, options = {}) {
   }
 }
 function buildBSplineSurface(heights, rows, cols, dx, dy, scaleZ) {
-  const oc = getKernel().oc;
-  const OC = oc;
-  const pntArray = new OC.TColgp_Array2OfPnt_2(1, rows, 1, cols);
+  var _stack = [];
   try {
+    const oc = getKernel().oc;
+    const scope = __using(_stack, new DisposalScope());
+    const pntArray = scope.register(new oc.TColgp_Array2OfPnt_2(1, rows, 1, cols));
     for (let r11 = 0; r11 < rows; r11++) {
       for (let c7 = 0; c7 < cols; c7++) {
         const row = heights[r11];
@@ -271,33 +272,24 @@ function buildBSplineSurface(heights, rows, cols, dx, dy, scaleZ) {
         pnt.delete();
       }
     }
-    const fitter = new OC.GeomAPI_PointsToBSplineSurface_2(pntArray, 3, 8, 0, 1e-3);
+    const fitter = scope.register(new oc.GeomAPI_PointsToBSplineSurface_2(pntArray, 3, 8, 0, 1e-3));
     const surface = fitter.Surface();
-    const faceMaker = new OC.BRepBuilderAPI_MakeFace_8(surface, 1e-6);
-    let result;
+    const faceMaker = scope.register(new oc.BRepBuilderAPI_MakeFace_8(surface, 1e-6));
     if (faceMaker.IsDone()) {
       const shape2 = castShape(faceMaker.Face());
       if (isFace(shape2)) {
-        result = ok(shape2);
-      } else {
-        shape2[Symbol.dispose]();
-        result = err(
-          occtError(BrepErrorCode.SURFACE_FAILED, "B-spline surface did not produce a face")
-        );
+        return ok(shape2);
       }
-    } else {
-      result = err(
-        occtError(
-          BrepErrorCode.SURFACE_FAILED,
-          "BRepBuilderAPI_MakeFace failed for B-spline surface"
-        )
-      );
+      shape2[Symbol.dispose]();
+      return err(occtError(BrepErrorCode.SURFACE_FAILED, "B-spline surface did not produce a face"));
     }
-    faceMaker.delete();
-    fitter.delete();
-    return result;
+    return err(
+      occtError(BrepErrorCode.SURFACE_FAILED, "BRepBuilderAPI_MakeFace failed for B-spline surface")
+    );
+  } catch (_2) {
+    var _error = _2, _hasError = true;
   } finally {
-    pntArray.delete();
+    __callDispose(_stack, _error, _hasError);
   }
 }
 function buildTriangulatedSurface(heights, rows, cols, dx, dy, scaleZ) {

package/dist/topology/surfaceFns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surfaceFns.d.ts","sourceRoot":"","sources":["../../src/topology/surfaceFns.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,mBAAmB,CAAC;AAGzD,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAC7C,OAAO,GAAE,sBAA2B,GACnC,MAAM,CAAC,QAAQ,CAAC,CAsDlB;AA2ID,MAAM,WAAW,uBAAwB,SAAQ,sBAAsB;IACrE,6DAA6D;IAC7D,OAAO,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,WAAW,CAAC;IACxC,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAqG3B"}
+{"version":3,"file":"surfaceFns.d.ts","sourceRoot":"","sources":["../../src/topology/surfaceFns.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,mBAAmB,CAAC;AAIzD,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAC7C,OAAO,GAAE,sBAA2B,GACnC,MAAM,CAAC,QAAQ,CAAC,CAsDlB;AA0HD,MAAM,WAAW,uBAAwB,SAAQ,sBAAsB;IACrE,6DAA6D;IAC7D,OAAO,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,WAAW,CAAC;IACxC,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAqG3B"}

package/package.json

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