Fix dry-run logic so that it does not run on the first load of the file (#366)

Author: martinRenou

packages/occ-worker/src/actions.ts

@@ -63,12 +63,15 @@ function buildModel(
   return outputModel;
 }
 
-function loadFile(payload: { content: IJCadContent }): IDict | null {
+function loadFile(
+  payload: { content: IJCadContent },
+  raiseOnFailure = false
+): IDict | null {
   const { content } = payload;
   const outputModel = buildModel(content);
 
   const parser = new OccParser(outputModel);
-  const result = parser.execute();
+  const result = parser.execute(raiseOnFailure);
   const postResult: IDict<IPostOperatorInput> = {};
   outputModel.forEach(item => {
     if (item.jcObject.shape?.startsWith('Post::')) {
@@ -82,9 +85,14 @@ function loadFile(payload: { content: IJCadContent }): IDict | null {
   return { result, postResult };
 }
 
+function dryRun(payload: { content: IJCadContent }) {
+  return loadFile(payload, true);
+}
+
 const WorkerHandler: {
   [key in WorkerAction]: (payload: any) => any;
 } = {} as any;
 WorkerHandler[WorkerAction.LOAD_FILE] = loadFile;
+WorkerHandler[WorkerAction.DRY_RUN] = dryRun;
 
 export default WorkerHandler;

packages/occ-worker/src/occapi/operatorCache.ts

@@ -154,7 +154,9 @@ export function operatorCache<T>(
   return (
     args: T,
     content: IJCadContent
-  ): { occShape: OCC.TopoDS_Shape; metadata?: IShapeMetadata | undefined } => {
+  ):
+    | { occShape: OCC.TopoDS_Shape; metadata?: IShapeMetadata | undefined }
+    | undefined => {
     const expandedArgs = expand_operator(name, args, content);
     const hash = `${hashCode(JSON.stringify(expandedArgs))}`;
     if (SHAPE_CACHE.has(hash)) {
@@ -168,10 +170,6 @@ export function operatorCache<T>(
         };
         SHAPE_CACHE.set(hash, cacheData);
         return cacheData;
-      } else {
-        throw new Error(
-          `Unknown error while creating ${name}: ${JSON.stringify(content)}`
-        );
       }
     }
   };

packages/occ-worker/src/occparser.ts

@@ -11,18 +11,23 @@ interface IShapeList {
 export class OccParser {
   private _shapeList: IShapeList[];
   private _occ: OCC.OpenCascadeInstance = (self as any).occ;
+
   constructor(shapeList: IShapeList[]) {
     this._shapeList = shapeList;
   }
 
-  execute(): IDict<IParsedShape> {
+  execute(raiseOnFailure = false): IDict<IParsedShape> {
     const maxDeviation = 0.1;
     const threejsData: IDict<IParsedShape> = {};
     this._shapeList.forEach(data => {
       const { shapeData, jcObject } = data;
       const { occShape, metadata } = shapeData;
       if (!occShape) {
-        return;
+        if (raiseOnFailure) {
+          throw Error('Unknown failure');
+        } else {
+          return;
+        }
       }
       new this._occ.BRepMesh_IncrementalMesh_2(
         occShape,

packages/occ-worker/src/worker.ts

@@ -57,7 +57,7 @@ self.onmessage = async (event: MessageEvent): Promise<void> => {
     }
     case WorkerAction.DRY_RUN: {
       try {
-        WorkerHandler[WorkerAction.LOAD_FILE](message.payload);
+        WorkerHandler[WorkerAction.DRY_RUN](message.payload);
       } catch (e) {
         let msg = '';