Merge pull request #1021 from LynchyC/master

Update lodash imports to use individual functions

Author: dylanvorster

.changeset/rude-hotels-buy.md

@@ -0,0 +1,10 @@
+---
+'@projectstorm/react-diagrams-gallery': patch
+'@projectstorm/geometry': patch
+'@projectstorm/react-canvas-core': patch
+'@projectstorm/react-diagrams-core': patch
+'@projectstorm/react-diagrams-defaults': patch
+'@projectstorm/react-diagrams-routing': patch
+---
+
+refactor: update lodash imports to use individual functions

diagrams-demo-gallery/demos/demo-cloning/index.tsx

@@ -1,5 +1,5 @@
 import createEngine, { DiagramModel, DefaultNodeModel, LinkModel, NodeModel } from '@projectstorm/react-diagrams';
-import * as _ from 'lodash';
+import _forEach from 'lodash/forEach';
 import * as React from 'react';
 import { DemoButton, DemoWorkspaceWidget } from '../helpers/DemoWorkspaceWidget';
 import { BaseModel, CanvasWidget } from '@projectstorm/react-canvas-core';
@@ -20,7 +20,7 @@ class CloneSelected extends React.Component<any, any> {
 		let model = engine.getModel();
 
 		let itemMap = {};
-		_.forEach(model.getSelectedEntities(), (item: BaseModel<any>) => {
+		_forEach(model.getSelectedEntities(), (item: BaseModel<any>) => {
 			let newItem = item.clone(itemMap);
 
 			// offset the nodes slightly

diagrams-demo-gallery/demos/demo-custom-action/index.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as _ from 'lodash';
+import _forEach from 'lodash/forEach';
 import createEngine, { DiagramModel, DefaultNodeModel, DefaultLinkModel } from '@projectstorm/react-diagrams';
 import { CanvasWidget, Action, ActionEvent, InputType } from '@projectstorm/react-canvas-core';
 import { DemoCanvasWidget } from '../helpers/DemoCanvasWidget';
@@ -26,7 +26,7 @@ class CustomDeleteItemsAction extends Action {
 						const confirm = window.confirm('Are you sure you want to delete?');
 
 						if (confirm) {
-							_.forEach(selectedEntities, (model) => {
+							_forEach(selectedEntities, (model) => {
 								// only delete items which are not locked
 								if (!model.isLocked()) {
 									model.remove();

diagrams-demo-gallery/demos/demo-drag-and-drop/components/BodyWidget.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as _ from 'lodash';
+import _keys from 'lodash/keys';
 import { TrayWidget } from './TrayWidget';
 import { Application } from '../Application';
 import { TrayItemWidget } from './TrayItemWidget';
@@ -57,7 +57,7 @@ export class BodyWidget extends React.Component<BodyWidgetProps> {
 					<S.Layer
 						onDrop={(event) => {
 							var data = JSON.parse(event.dataTransfer.getData('storm-diagram-node'));
-							var nodesCount = _.keys(this.props.app.getDiagramEngine().getModel().getNodes()).length;
+							var nodesCount = _keys(this.props.app.getDiagramEngine().getModel().getNodes()).length;
 
 							var node: DefaultNodeModel = null;
 							if (data.type === 'in') {

diagrams-demo-gallery/demos/demo-dynamic-ports/index.tsx

@@ -1,13 +1,13 @@
 import createEngine, { DiagramModel, DefaultNodeModel, DiagramEngine } from '@projectstorm/react-diagrams';
-import * as _ from 'lodash';
+import _values from 'lodash/values';
 import * as React from 'react';
 import { DemoButton, DemoWorkspaceWidget } from '../helpers/DemoWorkspaceWidget';
 import { CanvasWidget } from '@projectstorm/react-canvas-core';
 import { DemoCanvasWidget } from '../helpers/DemoCanvasWidget';
 
 class CloneSelected extends React.Component<{ model: DiagramModel; engine: DiagramEngine }, any> {
 	addPorts = () => {
-		const nodes: DefaultNodeModel[] = _.values(this.props.model.getNodes()) as DefaultNodeModel[];
+		const nodes: DefaultNodeModel[] = _values(this.props.model.getNodes()) as DefaultNodeModel[];
 		for (let node of nodes) {
 			if (node.getOptions().name === 'Node 2') {
 				node.addInPort(`in-${node.getInPorts().length + 1}`, false);

diagrams-demo-gallery/demos/demo-mutate-graph/index.tsx

@@ -1,6 +1,6 @@
 import createEngine, { DiagramModel, DefaultNodeModel, NodeModel } from '@projectstorm/react-diagrams';
 import * as React from 'react';
-import * as _ from 'lodash';
+import _values from 'lodash/values';
 import { DemoButton, DemoWorkspaceWidget } from '../helpers/DemoWorkspaceWidget';
 import { CanvasWidget } from '@projectstorm/react-canvas-core';
 import { DemoCanvasWidget } from '../helpers/DemoCanvasWidget';
@@ -30,7 +30,7 @@ class NodeDelayedPosition extends React.Component<any, any> {
 		let str = JSON.stringify(model.serialize());
 		let model2 = new DiagramModel();
 		let obj: ReturnType<DiagramModel['serialize']> = JSON.parse(str);
-		let node: ReturnType<NodeModel['serialize']> = _.values(obj.layers[1].models)[0] as any;
+		let node: ReturnType<NodeModel['serialize']> = _values(obj.layers[1].models)[0] as any;
 		node.x += 30;
 		node.y += 30;
 

diagrams-demo-gallery/package.json

@@ -45,7 +45,7 @@
     "@storybook/react-webpack5": "^7.4.4",
     "@storybook/storybook-deployer": "^2.8.16",
     "@storybook/theming": "^7.4.4",
-    "@types/lodash": "^4.14.199",
+    "@types/lodash": "^4.14.200",
     "@types/react": "^18.2.22",
     "@types/react-dom": "^18.2.7",
     "storybook": "^7.4.4"

diagrams-demo-gallery/tsconfig.json

@@ -2,6 +2,7 @@
 	"compileOnSave": false,
 	"compilerOptions": {
 		"suppressExcessPropertyErrors": true,
+		"esModuleInterop": true,
 		"declaration": true,
 		"composite": true,
 		"incremental": true,

packages/geometry/package.json

@@ -32,6 +32,6 @@
 		"lodash": "^4.17.21"
 	},
 	"devDependencies": {
-		"@types/lodash": "^4.14.199"
+		"@types/lodash": "^4.14.200"
 	}
 }

packages/geometry/src/Polygon.ts

@@ -1,5 +1,6 @@
 import { Point } from './Point';
-import * as _ from 'lodash';
+import _forEach from 'lodash/forEach';
+import _map from 'lodash/map';
 import { Matrix } from './Matrix';
 import { boundingBoxFromPoints } from './toolkit';
 import { Bounds, BoundsCorner } from './Bounds';
@@ -12,26 +13,26 @@ export class Polygon {
 	}
 
 	serialize() {
-		return _.map(this.points, (point) => {
+		return _map(this.points, (point) => {
 			return [point.x, point.y];
 		});
 	}
 
 	deserialize(data: any) {
-		this.points = _.map(data, (point) => {
+		this.points = _map(data, (point) => {
 			return new Point(point[0], point[1]);
 		});
 	}
 
 	scale(x, y, origin: Point) {
 		let matrix = Matrix.createScaleMatrix(x, y, origin);
-		_.forEach(this.points, (point) => {
+		_forEach(this.points, (point) => {
 			point.transform(matrix);
 		});
 	}
 
 	transform(matrix: Matrix) {
-		_.forEach(this.points, (point) => {
+		_forEach(this.points, (point) => {
 			point.transform(matrix);
 		});
 	}
@@ -49,13 +50,13 @@ export class Polygon {
 	}
 
 	translate(offsetX: number, offsetY: number) {
-		_.forEach(this.points, (point) => {
+		_forEach(this.points, (point) => {
 			point.translate(offsetX, offsetY);
 		});
 	}
 
 	doClone(ob: this) {
-		this.points = _.map(ob.points, (point) => {
+		this.points = _map(ob.points, (point) => {
 			return point.clone();
 		});
 	}