Merge pull request #72 from FlowTestAI/improve-graph-repr

Improve graph representation with proper versioning

Author: jsajal

packages/flowtest-electron/src/app/watcher.js

@@ -3,6 +3,7 @@ const path = require('path');
 const dotenv = require('dotenv');
 const { PATH_SEPARATOR, getSubdirectoriesFromRoot } = require('../utils/filemanager/filesystem');
 const readFile = require('../utils/filemanager/readfile');
+const { serialize } = require('../utils/flowparser/parser');
 
 class Watcher {
   constructor() {
@@ -32,13 +33,16 @@ class Watcher {
   add(mainWindow, pathname, collectionId, watchPath) {
     console.log(`[Watcher] File ${pathname} added`);
     if (this.isFlowTestFile(pathname)) {
+      const content = readFile(pathname);
+      const flowData = serialize(JSON.parse(content));
       const dirname = path.dirname(pathname);
       const subDirectories = getSubdirectoriesFromRoot(watchPath, dirname);
       const file = {
         name: path.basename(pathname),
         pathname: pathname,
         subDirectories,
         sep: PATH_SEPARATOR,
+        flowData,
       };
       mainWindow.webContents.send('main:create-flowtest', file, collectionId);
     } else if (this.isEnvFile(pathname, watchPath)) {

packages/flowtest-electron/src/ipc/collection.js

@@ -13,10 +13,10 @@ const { isDirectory, pathExists } = require('../utils/filemanager/filesystem');
 const createFile = require('../utils/filemanager/createfile');
 const updateFile = require('../utils/filemanager/updatefile');
 const deleteFile = require('../utils/filemanager/deletefile');
-const { flowDataToReadableData, readableDataToFlowData } = require('../utils/parser');
 const readFile = require('../utils/filemanager/readfile');
 const FlowtestAI = require('../utils/flowtestai');
 const { stringify, parse } = require('flatted');
+const { deserialize, serialize } = require('../utils/flowparser/parser');
 
 const collectionStore = new Collections();
 const flowTestAI = new FlowtestAI();
@@ -227,8 +227,8 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
   ipcMain.handle('renderer:create-flowtest', async (event, name, path, flowData) => {
     try {
       if (isDirectory(path)) {
-        const readableData = flowData ? flowDataToReadableData(flowData) : {};
-        createFile(`${name}.flow`, path, JSON.stringify(readableData, null, 4));
+        const textData = deserialize(flowData);
+        createFile(`${name}.flow`, path, JSON.stringify(textData, null, 4));
         console.log(`Created file: ${name}.flow`);
       }
     } catch (error) {
@@ -239,7 +239,7 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
   ipcMain.handle('renderer:read-flowtest', async (event, pathname, collectionId) => {
     try {
       const content = readFile(pathname);
-      const flowData = content === '{}' ? undefined : readableDataToFlowData(JSON.parse(content));
+      const flowData = serialize(JSON.parse(content));
       mainWindow.webContents.send('main:read-flowtest', pathname, collectionId, flowData);
     } catch (error) {
       return Promise.reject(error);
@@ -248,14 +248,14 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
 
   ipcMain.handle('renderer:read-flowtest-sync', (event, pathname) => {
     const content = readFile(pathname);
-    const flowData = content === '{}' ? undefined : readableDataToFlowData(JSON.parse(content));
+    const flowData = serialize(JSON.parse(content));
     return flowData;
   });
 
   ipcMain.handle('renderer:update-flowtest', async (event, pathname, flowData) => {
     try {
-      const readableData = flowDataToReadableData(flowData);
-      updateFile(pathname, JSON.stringify(readableData, null, 4));
+      const textData = deserialize(flowData);
+      updateFile(pathname, JSON.stringify(textData, null, 4));
       console.log(`Updated file: ${pathname}`);
     } catch (error) {
       return Promise.reject(error);

packages/flowtest-electron/src/utils/flowparser/AuthNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class AuthNode extends Node {
+  constructor() {
+    super('authNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'authNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const data = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  AuthNode,
+};

packages/flowtest-electron/src/utils/flowparser/ComplexNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class ComplexNode extends Node {
+  constructor() {
+    super('complexNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'complexNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const data = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  ComplexNode,
+};

packages/flowtest-electron/src/utils/flowparser/DelayNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class DelayNode extends Node {
+  constructor() {
+    super('delayNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'delayNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const data = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  DelayNode,
+};

packages/flowtest-electron/src/utils/flowparser/EvaluateNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class EvaluateNode extends Node {
+  constructor() {
+    super('evaluateNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'evaluateNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const data = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  EvaluateNode,
+};

packages/flowtest-electron/src/utils/flowparser/Node.js

@@ -0,0 +1,17 @@
+class Node {
+  constructor(type) {
+    this.type = type;
+  }
+
+  serialize(id, data, metadata) {
+    throw new Error('Serialize method must be implemented by subclasses');
+  }
+
+  deserialize(node) {
+    throw new Error('Deserialize method must be implemented by subclasses');
+  }
+}
+
+module.exports = {
+  Node,
+};

packages/flowtest-electron/src/utils/flowparser/OutputNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class OutputNode extends Node {
+  constructor() {
+    super('outputNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'outputNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const { ['output']: _, ...data } = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  OutputNode,
+};

packages/flowtest-electron/src/utils/flowparser/RequestNode.js

@@ -0,0 +1,34 @@
+const { Node } = require('./Node');
+
+class RequestNode extends Node {
+  constructor() {
+    super('requestNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      type: 'requestNode',
+      data,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    const data = node.data;
+    delete node.id;
+    delete node.data;
+    const metadata = node;
+
+    return {
+      id,
+      data,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  RequestNode,
+};

packages/flowtest-electron/src/utils/flowparser/StartNode.js

@@ -0,0 +1,29 @@
+const { Node } = require('./Node');
+
+class StartNode extends Node {
+  constructor() {
+    super('startNode');
+  }
+
+  serialize(id, data, metadata) {
+    return {
+      id,
+      ...metadata,
+    };
+  }
+
+  deserialize(node) {
+    const id = node.id;
+    delete node.id;
+    const metadata = node;
+
+    return {
+      id,
+      metadata,
+    };
+  }
+}
+
+module.exports = {
+  StartNode,
+};