small tweak in export to ocif, but better implementation needed

Author: devhelpr

libs/app-canvas/src/app/exporters/export-ocif.ts

@@ -65,6 +65,15 @@ export class OCIFExporter extends BaseExporter<OCIFFile, OCIFInfo> {
     return false;
   }
 
+  isExtensionInNode(node: any, extensionType: string): boolean {
+    if (node && node.data) {
+      return node.data.some(
+        (extension: any) => extensionType === extension.type
+      );
+    }
+    return false;
+  }
+
   isValidCodeFlowCanvasNode(node: any): boolean {
     if (node.data && Array.isArray(node.data)) {
       return node.data.some(
@@ -76,6 +85,10 @@ export class OCIFExporter extends BaseExporter<OCIFFile, OCIFInfo> {
     return false;
   }
 
+  isOcifCompatibleCodeFlowCanvasNode(nodeType: string) {
+    return codeFlowCanvasToOcif[nodeType] !== undefined;
+  }
+
   doesRootOCIFNodeExistInFlow(
     id: string,
     elements: ElementNodeMap<BaseNodeInfo>
@@ -123,8 +136,9 @@ export class OCIFExporter extends BaseExporter<OCIFFile, OCIFInfo> {
               ) {
                 const nodeType = codeFlowCanvasToOcif[d.type] ?? d.type;
                 if (
-                  nodeType === '@ocif/node/rect' ||
-                  nodeType === '@ocif/node/oval'
+                  !this.isExtensionInNode(codeFlowCanvasNode, nodeType) &&
+                  (nodeType === '@ocif/node/rect' ||
+                    nodeType === '@ocif/node/oval')
                 ) {
                   const canvasNode = this.getNodeFromElements(
                     node.id,
@@ -215,18 +229,34 @@ export class OCIFExporter extends BaseExporter<OCIFFile, OCIFInfo> {
         ports: ports,
       });
     }
-    const clonedNodeInfo = structuredClone(nodeInfo) as any;
-    delete clonedNodeInfo.fillColor;
-    delete clonedNodeInfo.strokeColor;
-    delete clonedNodeInfo.strokeWidth;
 
+    const clonedNodeInfo = structuredClone(nodeInfo) as any;
     const ocifNode: OCIFNode = {
       id: `${node.id}`,
       position: [node.x, node.y],
       size: [node.width ?? 0, node.height ?? 0],
       data: [...portsNode],
       resource: `${node.id}-resource`,
     };
+
+    if (
+      ocifNode &&
+      ocifNode.data &&
+      nodeInfo.type &&
+      this.isOcifCompatibleCodeFlowCanvasNode(nodeInfo.type)
+    ) {
+      const ocifType = codeFlowCanvasToOcif[nodeInfo.type];
+      ocifNode.data.push({
+        fillColor: clonedNodeInfo.fillColor,
+        strokeColor: clonedNodeInfo.strokeColor,
+        strokeWidth: clonedNodeInfo.strokeWidth,
+        type: ocifType,
+      });
+    }
+    delete clonedNodeInfo.fillColor;
+    delete clonedNodeInfo.strokeColor;
+    delete clonedNodeInfo.strokeWidth;
+
     if (nodeInfo.type === 'group') {
       // only export group as a relation
       if (