fix lint

Author: csouchet

dev/ts/component/SvgExporter.ts

@@ -16,7 +16,7 @@ limitations under the License.
 
 import type { mxGraph, mxSvgCanvas2D as mxSvgCanvas2DType } from 'mxgraph';
 
-import { mxgraph, mxClient, mxConstants, mxSvgCanvas2D, mxUtils } from '../../../src/component/mxgraph/initializer';
+import { mxgraph, mxClient, mxConstants, mxSvgCanvas2D, mxUtilities } from '../../../src/component/mxgraph/initializer';
 
 interface SvgExportOptions {
   scale: number;
@@ -47,7 +47,7 @@ export class SvgExporter {
 
   private doSvgExport(enableForeignObjectForLabel: boolean): string {
     const svgDocument = this.computeSvg({ scale: 1, border: 25, enableForeignObjectForLabel: enableForeignObjectForLabel });
-    const svgAsString = mxUtils.getXml(svgDocument);
+    const svgAsString = mxUtilities.getXml(svgDocument);
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 ${svgAsString}
@@ -64,7 +64,7 @@ ${svgAsString}
     const viewScale = this.graph.view.scale;
 
     // Prepares SVG document that holds the output
-    const svgDocument = mxUtils.createXmlDocument();
+    const svgDocument = mxUtilities.createXmlDocument();
     const root = svgDocument.createElementNS(mxConstants.NS_SVG, 'svg');
 
     const s = scale / viewScale;
@@ -168,7 +168,7 @@ class CanvasForExport extends mxSvgCanvas2D {
 
     try {
       this.htmlConverter.innerHTML = content;
-      content = mxUtils.extractTextWithWhitespace(this.htmlConverter.childNodes);
+      content = mxUtilities.extractTextWithWhitespace(this.htmlConverter.childNodes);
 
       // Workaround for substring breaking double byte UTF
       const exp = Math.ceil((2 * w) / this.state.fontSize);
@@ -193,7 +193,7 @@ class CanvasForExport extends mxSvgCanvas2D {
 
       // Uses result and adds ellipsis if more than 1 char remains
       if (result.length < content.length && content.length - result.length > 1) {
-        content = mxUtils.trim(result.join('')) + '...';
+        content = mxUtilities.trim(result.join('')) + '...';
       }
     } catch (error) {
       console.warn('Error while computing txt label', error);

dev/ts/component/ThemedBpmnVisualization.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { BpmnVisualization, FlowKind, ShapeBpmnElementKind, ShapeUtil, StyleConfigurator, StyleDefault } from '../../../src/bpmn-visualization';
+import { BpmnVisualization, FlowKind, ShapeBpmnElementKind, ShapeUtility, StyleConfigurator, StyleDefault } from '../../../src/bpmn-visualization';
 import { mxConstants } from '../../../src/component/mxgraph/initializer';
 import { logStartup } from '../shared/internal-helpers';
 
@@ -116,7 +116,7 @@ export class ThemedBpmnVisualization extends BpmnVisualization {
     const styleSheet = this.graph.getStylesheet();
 
     // EVENT
-    for (const kind of ShapeUtil.eventKinds()) {
+    for (const kind of ShapeUtility.eventKinds()) {
       let fillColor;
       let strokeColor;
       switch (kind) {
@@ -149,7 +149,7 @@ export class ThemedBpmnVisualization extends BpmnVisualization {
     }
 
     // TASK
-    for (const kind of ShapeUtil.taskKinds()) {
+    for (const kind of ShapeUtility.taskKinds()) {
       const style = styleSheet.styles[kind];
       style.fillColor = theme.taskAndCallActivityFillColor;
     }

dev/ts/development-bundle-index.ts

@@ -19,4 +19,4 @@ export * from './shared/main';
 export * from './shared/shared-helpers';
 export * from '../../src/bpmn-visualization';
 // extra code not exported by bpmn-visualization
-export * from '../../src/model/bpmn/internal/edge/utils';
+export * from '../../src/model/bpmn/internal/edge/utilities';

dev/ts/pages/elements-identification.ts

@@ -27,7 +27,7 @@ import {
   log,
   removeAllOverlays,
   removeCssClasses,
-  ShapeUtil,
+  ShapeUtility,
   startBpmnVisualization,
   updateLoadOptions,
   updateStyle,
@@ -63,37 +63,37 @@ function computeStyleUpdateByKind(bpmnKind: BpmnElementKind): StyleUpdate {
     return style;
   }
 
-  if (ShapeUtil.isTask(bpmnKind)) {
+  if (ShapeUtility.isTask(bpmnKind)) {
     style.font.color = 'Indigo';
     style.fill.color = 'gold';
     style.font.size = 14;
     style.fill.opacity = 20;
-  } else if (ShapeUtil.isEvent(bpmnKind)) {
-    if (ShapeUtil.isBoundaryEvent(bpmnKind)) {
+  } else if (ShapeUtility.isEvent(bpmnKind)) {
+    if (ShapeUtility.isBoundaryEvent(bpmnKind)) {
       style.font.color = 'inherit';
       style.fill.color = 'inherit';
       style.stroke.color = 'inherit';
     } else {
       style.font.color = 'MediumTurquoise';
       style.stroke.color = 'MediumTurquoise';
     }
-  } else if (ShapeUtil.isGateway(bpmnKind)) {
+  } else if (ShapeUtility.isGateway(bpmnKind)) {
     style.font.color = 'CadetBlue';
     style.font.opacity = 85;
     style.stroke.color = 'OrangeRed';
     style.stroke.width = 4;
-  } else if (ShapeUtil.isPoolOrLane(bpmnKind)) {
+  } else if (ShapeUtility.isPoolOrLane(bpmnKind)) {
     style.font.color = 'white !important';
     style.fill.color = 'deeppink';
     style.stroke.opacity = 80;
-  } else if (ShapeUtil.isCallActivity(bpmnKind)) {
+  } else if (ShapeUtility.isCallActivity(bpmnKind)) {
     style.font.color = 'white';
     style.font.family = 'Times New Roman';
     style.font.isItalic = true;
     style.font.isStrikeThrough = true;
 
     style.fill.color = { startColor: 'LightYellow', endColor: 'LimeGreen', direction: 'left-to-right' };
-  } else if (ShapeUtil.isSubProcess(bpmnKind)) {
+  } else if (ShapeUtility.isSubProcess(bpmnKind)) {
     style.font.color = 'white';
     style.font.size = 14;
     style.font.family = 'Dialog';
@@ -133,7 +133,7 @@ function updateStyleByAPI(bpmnIds: string[], bpmnKind: ShapeBpmnElementKind): vo
   }
   updateStyle(subProcessChildrenIds, { fill: { color: 'swimlane' }, stroke: { color: 'swimlane' }, font: { color: 'swimlane' } });
 
-  if (ShapeUtil.isBoundaryEvent(bpmnKind)) {
+  if (ShapeUtility.isBoundaryEvent(bpmnKind)) {
     lastIdentifiedParentBpmnIds = getParentElementIds(otherIds);
     updateStyle(lastIdentifiedParentBpmnIds, { opacity: 5, font: { color: 'green', opacity: 5 }, fill: { color: 'gold' }, stroke: { color: 'red' } });
   }
@@ -242,7 +242,7 @@ function configureControls(): void {
 }
 
 function getOverlay(bpmnKind: BpmnElementKind): Overlay {
-  if (ShapeUtil.isActivity(bpmnKind)) {
+  if (ShapeUtility.isActivity(bpmnKind)) {
     return {
       position: 'top-right',
       label: '30',

src/component/BpmnVisualization.ts

@@ -18,7 +18,7 @@ import type { BpmnGraph } from './mxgraph/BpmnGraph';
 import type { GlobalOptions, LoadOptions, ParserOptions, RendererOptions } from './options';
 import type { BpmnElementsRegistry } from './registry';
 
-import { htmlElement } from './helpers/dom-utils';
+import { htmlElement } from './helpers/dom-utilities';
 import { newBpmnRenderer } from './mxgraph/BpmnRenderer';
 import GraphConfigurator from './mxgraph/GraphConfigurator';
 import { Navigation } from './navigation';

src/component/helpers/array-utils.ts src/component/helpers/array-utilities.ts

@@ -20,7 +20,7 @@ import type { mxCellState, mxImageShape, mxShape } from 'mxgraph';
 import { mxgraph, mxRectangle } from './initializer';
 import { MxGraphCustomOverlay } from './overlay/custom-overlay';
 import { OverlayBadgeShape } from './overlay/shapes';
-import { overrideCreateSvgCanvas } from './shape/utils';
+import { overrideCreateSvgCanvas } from './shape/utilities';
 
 export class BpmnCellRenderer extends mxgraph.mxCellRenderer {
   constructor(private readonly iconPainter: IconPainter) {

src/component/helpers/dom-utils.ts src/component/helpers/dom-utilities.ts

@@ -23,7 +23,7 @@ import type { FitOptions, RendererOptions } from '../options';
 import type { RenderedModel } from '../registry/bpmn-model-registry';
 import type { mxCell } from 'mxgraph';
 
-import { MessageVisibleKind, ShapeUtil } from '../../model/bpmn/internal';
+import { MessageVisibleKind, ShapeUtility } from '../../model/bpmn/internal';
 import { MessageFlow } from '../../model/bpmn/internal/edge/flows';
 
 import { mxPoint } from './initializer';
@@ -74,7 +74,7 @@ export class BpmnRenderer {
     const bounds = shape.bounds;
     let labelBounds = shape.label?.bounds;
     // pool/lane label bounds are not managed for now (use hard coded values)
-    labelBounds = ShapeUtil.isPoolOrLane(bpmnElement.kind) ? undefined : labelBounds;
+    labelBounds = ShapeUtility.isPoolOrLane(bpmnElement.kind) ? undefined : labelBounds;
     const style = this.styleComputer.computeStyle(shape, labelBounds);
 
     this.insertVertex(parent, bpmnElement.id, bpmnElement.name, bounds, labelBounds, style);

src/component/mxgraph/BpmnCellRenderer.ts

@@ -17,7 +17,7 @@ limitations under the License.
 import type { BpmnGraph } from '../BpmnGraph';
 import type { mxStylesheet, StyleMap } from 'mxgraph';
 
-import { AssociationDirectionKind, FlowKind, SequenceFlowKind, ShapeBpmnElementKind, ShapeUtil } from '../../../model/bpmn/internal';
+import { AssociationDirectionKind, FlowKind, SequenceFlowKind, ShapeBpmnElementKind, ShapeUtility } from '../../../model/bpmn/internal';
 import { mxConstants, mxPerimeter } from '../initializer';
 import { BpmnStyleIdentifier, MarkerIdentifier, StyleDefault } from '../style';
 
@@ -179,7 +179,7 @@ export class StyleConfigurator {
   }
 
   private configureEventStyles(): void {
-    for (const kind of ShapeUtil.eventKinds()) {
+    for (const kind of ShapeUtility.eventKinds()) {
       const style: StyleMap = {};
       style[mxConstants.STYLE_SHAPE] = kind;
       style[mxConstants.STYLE_PERIMETER] = mxPerimeter.EllipsePerimeter;
@@ -215,7 +215,7 @@ export class StyleConfigurator {
   }
 
   private configureActivityStyles(): void {
-    for (const kind of ShapeUtil.activityKinds()) {
+    for (const kind of ShapeUtility.activityKinds()) {
       const style: StyleMap = {};
       style[mxConstants.STYLE_SHAPE] = kind;
       style[mxConstants.STYLE_ROUNDED] = true; // required by the BPMN specification
@@ -226,7 +226,7 @@ export class StyleConfigurator {
   }
 
   private configureGatewayStyles(): void {
-    for (const kind of ShapeUtil.gatewayKinds()) {
+    for (const kind of ShapeUtility.gatewayKinds()) {
       const style: StyleMap = {};
       style[mxConstants.STYLE_SHAPE] = kind;
       style[mxConstants.STYLE_PERIMETER] = mxPerimeter.RhombusPerimeter;

src/component/mxgraph/BpmnRenderer.ts

@@ -52,7 +52,7 @@ export const mxRectangleShape = mxgraph.mxRectangleShape;
 /** @internal */
 export const mxSvgCanvas2D = mxgraph.mxSvgCanvas2D;
 /** @internal */
-export const mxUtils = mxgraph.mxUtils;
+export const mxUtilities = mxgraph.mxUtils;
 
 /** @internal */
 declare global {

src/component/mxgraph/config/StyleConfigurator.ts

@@ -17,7 +17,7 @@ limitations under the License.
 import type { Overlay } from '../../registry';
 import type { BpmnGraph } from '../BpmnGraph';
 
-import { ensureIsArray } from '../../helpers/array-utils';
+import { ensureIsArray } from '../../helpers/array-utilities';
 
 import { OverlayConverter } from './converter';
 import { MxGraphCustomOverlay } from './custom-overlay';

src/component/mxgraph/initializer.ts

@@ -19,7 +19,7 @@ import type { Edge } from '../../../model/bpmn/internal/edge/edge';
 import type { Font } from '../../../model/bpmn/internal/Label';
 import type { RendererOptions } from '../../options';
 
-import { MessageVisibleKind, ShapeBpmnCallActivityKind, ShapeBpmnElementKind, ShapeBpmnMarkerKind, ShapeUtil } from '../../../model/bpmn/internal';
+import { MessageVisibleKind, ShapeBpmnCallActivityKind, ShapeBpmnElementKind, ShapeBpmnMarkerKind, ShapeUtility } from '../../../model/bpmn/internal';
 import { AssociationFlow, SequenceFlow } from '../../../model/bpmn/internal/edge/flows';
 import Shape from '../../../model/bpmn/internal/shape/Shape';
 import {
@@ -70,7 +70,7 @@ export default class StyleComputer {
       computeEventShapeStyle(bpmnElement, styleValues);
     } else if (bpmnElement instanceof ShapeBpmnActivity) {
       computeActivityShapeStyle(bpmnElement, styleValues);
-    } else if (ShapeUtil.isPoolOrLane(bpmnElement.kind)) {
+    } else if (ShapeUtility.isPoolOrLane(bpmnElement.kind)) {
       // mxConstants.STYLE_HORIZONTAL is for the label
       // In BPMN, isHorizontal is for the Shape
       // So we invert the value when we switch from the BPMN value to the mxGraph value.
@@ -85,7 +85,7 @@ export default class StyleComputer {
       const fillColor = extensions.fillColor;
       if (fillColor) {
         styleValues.set(mxConstants.STYLE_FILLCOLOR, fillColor);
-        if (ShapeUtil.isPoolOrLane(bpmnElement.kind)) {
+        if (ShapeUtility.isPoolOrLane(bpmnElement.kind)) {
           styleValues.set(mxConstants.STYLE_SWIMLANE_FILLCOLOR, fillColor);
         }
       }

src/component/mxgraph/overlay/updater.ts

@@ -16,8 +16,8 @@ limitations under the License.
 
 import type { mxCell } from 'mxgraph';
 
-import { ShapeUtil } from '../../../model/bpmn/internal';
-import { isFlowKind } from '../../../model/bpmn/internal/edge/utils';
+import { ShapeUtility as ShapeUtility } from '../../../model/bpmn/internal';
+import { isFlowKind } from '../../../model/bpmn/internal/edge/utilities';
 import { BpmnStyleIdentifier } from '../style/identifiers';
 
 /**
@@ -47,12 +47,12 @@ export function computeAllBpmnClassNames(style: string, isLabel: boolean): strin
   const bpmnElementKind = pseudoBpmnElementKind.replace(/shape=bpmn./g, '');
 
   const typeClasses = new Map<string, boolean>();
-  typeClasses.set('bpmn-type-activity', ShapeUtil.isActivity(bpmnElementKind));
-  typeClasses.set('bpmn-type-container', ShapeUtil.isPoolOrLane(bpmnElementKind));
-  typeClasses.set('bpmn-type-event', ShapeUtil.isEvent(bpmnElementKind));
+  typeClasses.set('bpmn-type-activity', ShapeUtility.isActivity(bpmnElementKind));
+  typeClasses.set('bpmn-type-container', ShapeUtility.isPoolOrLane(bpmnElementKind));
+  typeClasses.set('bpmn-type-event', ShapeUtility.isEvent(bpmnElementKind));
   typeClasses.set('bpmn-type-flow', isFlowKind(bpmnElementKind));
-  typeClasses.set('bpmn-type-gateway', ShapeUtil.isGateway(bpmnElementKind));
-  typeClasses.set('bpmn-type-task', ShapeUtil.isTask(bpmnElementKind));
+  typeClasses.set('bpmn-type-gateway', ShapeUtility.isGateway(bpmnElementKind));
+  typeClasses.set('bpmn-type-task', ShapeUtility.isTask(bpmnElementKind));
   for (const [className] of [...typeClasses].filter(([, isType]) => isType)) classes.push(className);
 
   classes.push(computeBpmnBaseClassName(bpmnElementKind));

src/component/mxgraph/renderer/StyleComputer.ts

@@ -18,12 +18,12 @@ import type { BpmnCanvas, IconPainter, PaintParameter, ShapeConfiguration } from
 import type { mxAbstractCanvas2D } from 'mxgraph';
 
 import { ShapeBpmnElementKind, ShapeBpmnMarkerKind, ShapeBpmnSubProcessKind } from '../../../model/bpmn/internal';
-import { mxRectangleShape, mxUtils } from '../initializer';
+import { mxRectangleShape, mxUtilities } from '../initializer';
 import { BpmnStyleIdentifier, StyleDefault } from '../style';
-import { getBpmnIsInstantiating } from '../style/utils';
+import { getBpmnIsInstantiating } from '../style/utilities';
 
 import { buildPaintParameter } from './render/icon-painter';
-import { orderActivityMarkers } from './render/utils';
+import { orderActivityMarkers } from './render/utilities';
 
 function getMarkerIconOriginFunction(numberOfMarkers: number, markerPosition: number): (canvas: BpmnCanvas) => void {
   return numberOfMarkers === 1
@@ -62,7 +62,7 @@ export abstract class BaseActivityShape extends mxRectangleShape {
   }
 
   protected paintMarkerIcons(paintParameter: PaintParameter): void {
-    const markers = mxUtils.getValue(this.style, BpmnStyleIdentifier.MARKERS, undefined);
+    const markers = mxUtilities.getValue(this.style, BpmnStyleIdentifier.MARKERS, undefined);
     if (markers) {
       const orderedMarkers = orderActivityMarkers(markers.split(','));
       for (const [index, marker] of orderedMarkers.entries()) {
@@ -205,7 +205,7 @@ export class CallActivityShape extends BaseActivityShape {
 
     const paintParameter = buildPaintParameter({ canvas: c, x, y, width: w, height: h, shape: this });
 
-    switch (mxUtils.getValue(this.style, BpmnStyleIdentifier.GLOBAL_TASK_KIND, undefined)) {
+    switch (mxUtilities.getValue(this.style, BpmnStyleIdentifier.GLOBAL_TASK_KIND, undefined)) {
       case ShapeBpmnElementKind.GLOBAL_TASK_MANUAL: {
         this.iconPainter.paintHandIcon({
           ...paintParameter,
@@ -247,7 +247,7 @@ export class CallActivityShape extends BaseActivityShape {
  */
 export class SubProcessShape extends BaseActivityShape {
   override paintBackground(c: mxAbstractCanvas2D, x: number, y: number, w: number, h: number): void {
-    const subProcessKind = mxUtils.getValue(this.style, BpmnStyleIdentifier.SUB_PROCESS_KIND, undefined);
+    const subProcessKind = mxUtilities.getValue(this.style, BpmnStyleIdentifier.SUB_PROCESS_KIND, undefined);
     c.save(); // ensure we can later restore the configuration
     if (subProcessKind === ShapeBpmnSubProcessKind.EVENT) {
       c.setDashed(true, false);

src/component/mxgraph/renderer/style-utils.ts src/component/mxgraph/renderer/style-utilities.ts

@@ -16,7 +16,7 @@ limitations under the License.
 
 import type { mxAbstractCanvas2D, mxPoint } from 'mxgraph';
 
-import { mxgraph, mxSvgCanvas2D, mxUtils } from '../initializer';
+import { mxgraph, mxSvgCanvas2D, mxUtilities } from '../initializer';
 import { BpmnStyleIdentifier } from '../style';
 
 export class BpmnConnector extends mxgraph.mxConnector {
@@ -34,12 +34,12 @@ export class BpmnConnector extends mxgraph.mxConnector {
     c.setDashed(false, false);
 
     if (sourceMarker != null) {
-      c.setFillColor(mxUtils.getValue(this.style, BpmnStyleIdentifier.EDGE_START_FILL_COLOR, this.stroke));
+      c.setFillColor(mxUtilities.getValue(this.style, BpmnStyleIdentifier.EDGE_START_FILL_COLOR, this.stroke));
       sourceMarker();
     }
 
     if (targetMarker != null) {
-      c.setFillColor(mxUtils.getValue(this.style, BpmnStyleIdentifier.EDGE_END_FILL_COLOR, this.stroke));
+      c.setFillColor(mxUtilities.getValue(this.style, BpmnStyleIdentifier.EDGE_END_FILL_COLOR, this.stroke));
       targetMarker();
     }
   }

src/component/mxgraph/shape/activity-shapes.ts

@@ -18,7 +18,7 @@ import type { BpmnCanvas, PaintParameter, IconPainter } from './render';
 import type { mxAbstractCanvas2D } from 'mxgraph';
 
 import { ShapeBpmnEventDefinitionKind } from '../../../model/bpmn/internal';
-import { mxgraph, mxUtils } from '../initializer';
+import { mxgraph, mxUtilities } from '../initializer';
 import { BpmnStyleIdentifier, StyleDefault } from '../style';
 
 import { buildPaintParameter } from './render/icon-painter';
@@ -90,7 +90,7 @@ export class EventShape extends mxgraph.mxEllipse {
   override paintVertexShape(c: mxAbstractCanvas2D, x: number, y: number, w: number, h: number): void {
     const paintParameter = buildPaintParameter({ canvas: c, x, y, width: w, height: h, shape: this, isFilled: this.withFilledIcon });
 
-    setDashedOuterShapePattern(paintParameter, mxUtils.getValue(this.style, BpmnStyleIdentifier.IS_INTERRUPTING, undefined));
+    setDashedOuterShapePattern(paintParameter, mxUtilities.getValue(this.style, BpmnStyleIdentifier.IS_INTERRUPTING, undefined));
     this.paintOuterShape(paintParameter);
     restoreOriginalOuterShapePattern(paintParameter);
 
@@ -102,7 +102,7 @@ export class EventShape extends mxgraph.mxEllipse {
   }
 
   private paintInnerShape(paintParameter: PaintParameter): void {
-    const paintIcon = this.iconPainters.get(mxUtils.getValue(this.style, BpmnStyleIdentifier.EVENT_DEFINITION_KIND, ShapeBpmnEventDefinitionKind.NONE));
+    const paintIcon = this.iconPainters.get(mxUtilities.getValue(this.style, BpmnStyleIdentifier.EVENT_DEFINITION_KIND, ShapeBpmnEventDefinitionKind.NONE));
     paintIcon?.(paintParameter);
   }
 }