flow-lib-creomnia 1.0.3 → 1.0.5-dev.1

package/lib/modules/node/services/expandCoefficientServices.js

@@ -4,13 +4,16 @@ exports.expandCoefficientServices = void 0;
 const config_1 = require("../../../config");
 class ExpandCoefficientServices {
     calculateNodeExpandCoefficient = (nodes) => {
+        const nodeMap = new Map(nodes.map((node) => [node.id, node]));
         const calculateNodeExpandCoefficientRecursion = ({ startNode, expandCoefficient, indexOfEncapsulation, }) => {
             if (!startNode.childrenIds?.length ||
                 (startNode.startSectionNodeId && indexOfEncapsulation <= 0)) {
                 return expandCoefficient;
             }
             if (startNode.startSectionNodeId && indexOfEncapsulation > 0) {
-                const childrenNodes = nodes.filter((node) => startNode.childrenIds?.includes(node.id));
+                const childrenNodes = (startNode.childrenIds || [])
+                    .map((id) => nodeMap.get(id))
+                    .filter((node) => !!node);
                 const nextExpandCoefficient = calculateNodeExpandCoefficientRecursion({
                     startNode: childrenNodes[0],
                     expandCoefficient: 0,
@@ -18,7 +21,9 @@ class ExpandCoefficientServices {
                 });
                 return Math.max(expandCoefficient, nextExpandCoefficient);
             }
-            const childrenNodes = nodes.filter((node) => startNode.childrenIds?.includes(node.id));
+            const childrenNodes = (startNode.childrenIds || [])
+                .map((id) => nodeMap.get(id))
+                .filter((node) => !!node);
             const childrenNodesExpandCoefficient = childrenNodes.map((node) => {
                 const isExpandable = config_1.Config.NODES_WITH_DOUBLE_CONNECTION.includes(startNode.type);
                 const calculatedExpandCoefficient = isExpandable

package/lib/modules/node/services/nodeServices.js

@@ -5,6 +5,7 @@ const enums_1 = require("../enums");
 const pointCalculationServices_1 = require("./pointCalculationServices");
 class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
     combineNodes = (currentNodes, nodes) => {
+        const nodeMap = new Map(nodes.map((node) => [node.id, node]));
         const hubNodes = nodes.reduce((hubNodes, node) => {
             if (node.startSectionNodeId) {
                 return {
@@ -25,7 +26,7 @@ class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
                 const childrenIds = currentNode.childrenIds || [];
                 const childNodes = childrenIds
                     .map((childId) => {
-                    return nodes.find((node) => node.id === childId) || [];
+                    return nodeMap.get(childId) || [];
                 })
                     .flat();
                 const blockedChildrenIds = currentNode.blockedChildrenIds || [];
@@ -79,10 +80,11 @@ class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
                 childrenNodes: [],
                 updatedHubNodes: hubNodes,
             });
+            const combinedNodesMap = new Map(combinedNodes.map((n) => [n.id, n]));
             const drawableNodes = currentNodes.map((node) => {
                 const startSectionNodeId = node.startSectionNodeId;
                 const parent = startSectionNodeId
-                    ? combinedNodes.find((node) => node.id === startSectionNodeId)
+                    ? combinedNodesMap.get(startSectionNodeId)
                     : combinedNodes.find((parentNode) => parentNode.nodeData?.childrenIds?.includes(node.id));
                 // TODO it works when node has 2 children but should be refactored
                 const isSecondBranch = parent?.nodeData?.rightChildrenId === node.id;

package/lib/modules/node/types/index.d.ts

@@ -17,7 +17,7 @@ export type SettingsType = {
 export type NodeType = {
     id: string;
     name?: string;
-    extensionName?: string;
+    nodeType?: string;
     description?: string;
     icon?: JSX.Element;
     type: NodeTypeEnum;

package/package.json

@@ -1,65 +1,68 @@
-{
-  "name": "flow-lib-creomnia",
-  "version": "1.0.3",
-  "description": "",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "private": false,
-  "scripts": {
-    "test": "jest --config jestconfig.json",
-    "clean": "rm -rf ./lib",
-    "copy-files": "cp -R src/assets lib/assets",
-    "build": "npm run clean && tsc && npm run copy-files",
-    "publish-package": "npm run build && npm publish"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@types/jest": "^29.5.2",
-    "@types/react": "^18.2.12",
-    "@types/react-dom": "^18.2.5",
-    "@types/react-svg": "^5.0.0",
-    "jest": "^29.5.0",
-    "prettier": "^2.8.8",
-    "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "ts-jest": "^29.1.0",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^5.1.3"
-  },
-  "files": [
-    "lib/**/*"
-  ],
-  "peerDependencies": {
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.13.5",
-    "@mui/styled-engine-sc": "^5.12.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-svg": "^16.1.17",
-    "styled-components": "^5.3.11"
-  },
-  "dependencies": {
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.13.5",
-    "@mui/styled-engine-sc": "^5.12.0",
-    "@react-spring/rafz": "^9.7.3",
-    "@react-spring/web": "^9.7.3",
-    "react": "^18.2.0",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.2.0",
-    "react-svg": "^16.1.17",
-    "react-zoom-pan-pinch": "^3.3.0",
-    "styled-components": "^5.3.11"
-  },
-  "readme": "ERROR: No README data found!"
-}
+{
+  "name": "flow-lib-creomnia",
+  "version": "1.0.5-dev.1",
+  "description": "",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "private": false,
+  "scripts": {
+    "test": "jest --config jestconfig.json",
+    "clean": "rm -rf ./lib",
+    "copy-files": "cp -R src/assets lib/assets",
+    "build": "npm run clean && tsc && npm run copy-files",
+    "publish-package": "npm run build && npm publish",
+    "publishPackage": "npm run build && npm publish",
+    "publishPackageDev": "npm run build && npm publish --tag dev",
+    "publishPackageQa": "npm run build && npm publish --tag qa"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@types/jest": "^29.5.2",
+    "@types/react": "^18.2.12",
+    "@types/react-dom": "^18.2.5",
+    "@types/react-svg": "^5.0.0",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.8",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "ts-jest": "^29.1.0",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^5.1.3"
+  },
+  "files": [
+    "lib/**/*"
+  ],
+  "peerDependencies": {
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.11.16",
+    "@mui/material": "^5.13.5",
+    "@mui/styled-engine-sc": "^5.12.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-svg": "^16.1.17",
+    "styled-components": "^5.3.11"
+  },
+  "dependencies": {
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.11.16",
+    "@mui/material": "^5.13.5",
+    "@mui/styled-engine-sc": "^5.12.0",
+    "@react-spring/rafz": "^9.7.3",
+    "@react-spring/web": "^9.7.3",
+    "react": "^18.2.0",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": "^18.2.0",
+    "react-svg": "^16.1.17",
+    "react-zoom-pan-pinch": "^3.3.0",
+    "styled-components": "^5.3.11"
+  },
+  "readme": "ERROR: No README data found!"
+}