refactored to exclude generic worker code in a separate library bitbybit-occt-worker

Author: matas-bitbybit-dev

declarationsBase.ts

@@ -1887,17 +1887,10 @@ declare class Line {
      * @returns OpenCascade geom surface
      */
     surfaceFromFace(inputs: Inputs.OCCT.ShapeDto<Inputs.OCCT.TopoDSFacePointer>): Promise<Inputs.OCCT.GeomSurfacePointer>;
-}declare class OCCTIO {
-    private readonly occWorkerManager;
+}declare class OCCTIO extends BaseOCCTIO {
+    readonly occWorkerManager: OCCTWorkerManager;
     private readonly geometryHelper;
     constructor(occWorkerManager: OCCTWorkerManager, geometryHelper: GeometryHelper);
-    /**
-     * Saves the step file
-     * @link https://docs.bitbybit.dev/classes/bitbybit_occt_io.OCCTIO.html#saveShapeSTEP
-     * @param inputs STEP filename and shape to be saved
-     * @returns String of a step file
-     */
-    saveShapeSTEP(inputs: Inputs.OCCT.SaveStepDto<Inputs.OCCT.TopoDSShapePointer>): Promise<string>;
     /**
      * Imports the step or iges asset file
      * @link https://docs.bitbybit.dev/classes/bitbybit_occt_io.OCCTIO.html#loadSTEPorIGES
@@ -1913,23 +1906,13 @@ declare class Line {
     saveShapeStl(inputs: Inputs.OCCT.SaveStlDto<Inputs.OCCT.TopoDSShapePointer>): Promise<Inputs.OCCT.DecomposedMeshDto>;
 }/**
  * Contains various methods for OpenCascade implementation
- * Much of the work is done by Johnathon Selstad and Sebastian Alff to port OCC to JavaScript
- * I'm super grateful for their work!
  */
-declare class OCCT {
+declare class OCCT extends BaseOCCT {
     private readonly context;
-    private readonly occWorkerManager;
+    readonly occWorkerManager: OCCTWorkerManager;
     private readonly geometryHelper;
     private readonly solidText;
     private readonly vector;
-    readonly shapes: OCCTShapes;
-    readonly geom: OCCTGeom;
-    readonly assembly: OCCTAssembly;
-    readonly fillets: OCCTFillets;
-    readonly transforms: OCCTTransforms;
-    readonly operations: OCCTOperations;
-    readonly booleans: OCCTBooleans;
-    readonly advanced: OCCTAdvanced;
     readonly io: OCCTIO;
     constructor(context: Context, occWorkerManager: OCCTWorkerManager, geometryHelper: GeometryHelper, solidText: JSCADText, vector: Vector);
     /**

declarationsInputs.ts

@@ -730,17 +730,17 @@ export const inputDeclarations = `declare namespace Asset {
 * from './verb-inputs';
 * from './jscad-inputs';
 * from './tag-inputs';
-* from './occ-inputs';
 * from './asset-inputs';
-* from './base-inputs';
 * from './draw-inputs';
 * from './babylon-mesh-inputs';
 * from './babylon-camera-inputs';
 * from './babylon-ray-inputs';
 * from './babylon-pick-inputs';
 * from './babylon-webxr';
 * from './babylon-material-inputs';
-* from './time-inputs';declare namespace JSCAD {
+* from './time-inputs';
+* from 'bitbybit-occt/lib/api/inputs/occ-inputs';
+* from 'bitbybit-occt/lib/api/inputs/base-inputs';declare namespace JSCAD {
     class DrawSolidMeshDto {
         /**
          * Provide options without default values

index.ts

@@ -7,9 +7,6 @@ export * from './lib/api/inputs';
 export * from './lib/api/bitbybit/babylon/transforms';
 export * from './lib/bit-by-bit-blockly-helper.service';
 export * from './lib/models/print-save.model';
-export * from './lib/workers/occ/occ-info';
-export * from './lib/workers/occ/occ-state.enum';
-export * from './lib/workers/occ/occ-worker-manager';
 export * from './lib/workers/jscad/jscad-info';
 export * from './lib/workers/jscad/jscad-state.enum';
 export * from './lib/workers/jscad/jscad-worker-manager';

lib/api/bitbybit.ts

@@ -10,25 +10,22 @@ import { JSCAD } from './bitbybit/jscad/jscad';
 import { Tag } from './bitbybit/tag';
 import { Time } from './bitbybit/time';
 import { OCCT } from './bitbybit/occt/occt';
+import { OCCT as BaseOCCT } from 'bitbybit-occt-worker/lib/api/occt/occt';
 import { Asset } from './bitbybit/asset';
 import { Color } from './bitbybit/color';
 import { Context } from './context';
 import { GeometryHelper } from './geometry-helper';
 import { JSCADWorkerManager } from '../workers/jscad/jscad-worker-manager';
-import { OCCTWorkerManager } from '../workers/occ/occ-worker-manager';
+import { OCCTWorkerManager } from 'bitbybit-occt-worker/lib/occ-worker/occ-worker-manager';
 import { Scene } from '@babylonjs/core';
-import { OCCTService } from 'bitbybit-occt/lib/occ-service';
-import { OccHelper } from 'bitbybit-occt/lib/occ-helper';
-import { VectorHelperService } from 'bitbybit-occt/lib/api/vector-helper.service';
-import { ShapesHelperService } from 'bitbybit-occt/lib/api/shapes-helper.service';
 import { OpenCascadeInstance } from 'bitbybit-occt/bitbybit-dev-occt/bitbybit-dev-occt';
 
 export class BitByBitBase {
 
     public context: Context;
     public jscadWorkerManager: JSCADWorkerManager;
     public occtWorkerManager: OCCTWorkerManager;
-    
+
     public babylon: Babylon;
     public vector: Vector;
     public point: Point;
@@ -39,7 +36,7 @@ export class BitByBitBase {
     public jscad: JSCAD;
     public tag: Tag;
     public time: Time;
-    public occt: OCCT | OCCTService;
+    public occt: OCCT & BaseOCCT;
     public asset: Asset;
     public color: Color;
 
@@ -79,11 +76,6 @@ export class BitByBitBase {
         this.context.scene = scene;
         if (occt) {
             this.occtWorkerManager.setOccWorker(occt);
-        } else if (!occt && occtInstance) {
-            const vecService = new VectorHelperService();
-            const shapesService = new ShapesHelperService();
-            const openCascade = new OCCTService(occtInstance, new OccHelper(vecService, shapesService, occtInstance));
-            this.occt = openCascade;
         }
         if (jscad) {
             this.jscadWorkerManager.setJscadWorker(jscad);