bpmn-js 17.4.0 → 17.5.0

package/lib/import/BpmnTreeWalker.js

@@ -13,8 +13,6 @@ import {
 } from '../util/CompatibilityUtil';
 
 /**
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
- *
  * @typedef {import('../model/Types').ModdleElement} ModdleElement
  */
 
@@ -47,9 +45,8 @@ function findDisplayCandidate(definitions) {
 
 /**
  * @param {Record<'element' | 'root' | 'error', Function>} handler
- * @param {Translate} translate
  */
-export default function BpmnTreeWalker(handler, translate) {
+export default function BpmnTreeWalker(handler) {
 
   // list of containers already walked
   var handledElements = {};
@@ -83,7 +80,7 @@ export default function BpmnTreeWalker(handler, translate) {
     // avoid multiple rendering of elements
     if (gfx) {
       throw new Error(
-        translate('already rendered {element}', { element: elementToString(element) })
+        'already rendered ${ elementToString(element) }'
       );
     }
 
@@ -103,11 +100,10 @@ export default function BpmnTreeWalker(handler, translate) {
       handled(element);
 
       return gfx;
-    } catch (e) {
-      logError(e.message, { element: element, error: e });
+    } catch (error) {
+      logError(error.message, { element, error });
 
-      console.error(translate('failed to import {element}', { element: elementToString(element) }));
-      console.error(e);
+      console.error(`failed to import ${ elementToString(element) }`, error);
     }
   }
 
@@ -123,9 +119,7 @@ export default function BpmnTreeWalker(handler, translate) {
     if (bpmnElement) {
       if (diMap[bpmnElement.id]) {
         logError(
-          translate('multiple DI elements defined for {element}', {
-            element: elementToString(bpmnElement)
-          }),
+          `multiple DI elements defined for ${ elementToString(bpmnElement) }`,
           { element: bpmnElement }
         );
       } else {
@@ -135,9 +129,7 @@ export default function BpmnTreeWalker(handler, translate) {
       }
     } else {
       logError(
-        translate('no bpmnElement referenced in {element}', {
-          element: elementToString(di)
-        }),
+        `no bpmnElement referenced in ${ elementToString(di) }`,
         { element: di }
       );
     }
@@ -175,7 +167,7 @@ export default function BpmnTreeWalker(handler, translate) {
     var diagrams = definitions.diagrams;
 
     if (diagram && diagrams.indexOf(diagram) === -1) {
-      throw new Error(translate('diagram not part of bpmn:Definitions'));
+      throw new Error('diagram not part of <bpmn:Definitions />');
     }
 
     if (!diagram && diagrams && diagrams.length) {
@@ -184,7 +176,7 @@ export default function BpmnTreeWalker(handler, translate) {
 
     // no diagram -> nothing to import
     if (!diagram) {
-      throw new Error(translate('no diagram to display'));
+      throw new Error('no diagram to display');
     }
 
     // load DI from selected diagram only
@@ -195,10 +187,9 @@ export default function BpmnTreeWalker(handler, translate) {
     var plane = diagram.plane;
 
     if (!plane) {
-      throw new Error(translate(
-        'no plane for {element}',
-        { element: elementToString(diagram) }
-      ));
+      throw new Error(
+        `no plane for ${ elementToString(diagram) }`
+      );
     }
 
     var rootElement = plane.bpmnElement;
@@ -209,14 +200,11 @@ export default function BpmnTreeWalker(handler, translate) {
       rootElement = findDisplayCandidate(definitions);
 
       if (!rootElement) {
-        throw new Error(translate('no process or collaboration to display'));
+        throw new Error('no process or collaboration to display');
       } else {
 
         logError(
-          translate('correcting missing bpmnElement on {plane} to {rootElement}', {
-            plane: elementToString(plane),
-            rootElement: elementToString(rootElement)
-          })
+          `correcting missing bpmnElement on ${ elementToString(plane) } to ${ elementToString(rootElement) }`
         );
 
         // correct DI on the fly
@@ -237,10 +225,7 @@ export default function BpmnTreeWalker(handler, translate) {
       handleUnhandledProcesses(definitions.rootElements, ctx);
     } else {
       throw new Error(
-        translate('unsupported bpmnElement for {plane}: {rootElement}', {
-          plane: elementToString(plane),
-          rootElement: elementToString(rootElement)
-        })
+        `unsupported bpmnElement for ${ elementToString(plane) }: ${ elementToString(rootElement) }`
       );
     }
 
@@ -402,31 +387,31 @@ export default function BpmnTreeWalker(handler, translate) {
   }
 
   function handleFlowElements(flowElements, context) {
-    forEach(flowElements, function(e) {
-      if (is(e, 'bpmn:SequenceFlow')) {
+    forEach(flowElements, function(flowElement) {
+      if (is(flowElement, 'bpmn:SequenceFlow')) {
         deferred.push(function() {
-          handleSequenceFlow(e, context);
+          handleSequenceFlow(flowElement, context);
         });
-      } else if (is(e, 'bpmn:BoundaryEvent')) {
+      } else if (is(flowElement, 'bpmn:BoundaryEvent')) {
         deferred.unshift(function() {
-          handleFlowNode(e, context);
+          handleFlowNode(flowElement, context);
         });
-      } else if (is(e, 'bpmn:FlowNode')) {
-        handleFlowNode(e, context);
-      } else if (is(e, 'bpmn:DataObject')) {
+      } else if (is(flowElement, 'bpmn:FlowNode')) {
+        handleFlowNode(flowElement, context);
+      } else if (is(flowElement, 'bpmn:DataObject')) {
 
         // SKIP (assume correct referencing via DataObjectReference)
-      } else if (is(e, 'bpmn:DataStoreReference')) {
-        handleDataElement(e, context);
-      } else if (is(e, 'bpmn:DataObjectReference')) {
-        handleDataElement(e, context);
+      } else if (is(flowElement, 'bpmn:DataStoreReference')) {
+        handleDataElement(flowElement, context);
+      } else if (is(flowElement, 'bpmn:DataObjectReference')) {
+        handleDataElement(flowElement, context);
       } else {
         logError(
-          translate('unrecognized flowElement {element} in context {context}', {
-            element: elementToString(e),
-            context: (context ? elementToString(context.businessObject) : 'null')
-          }),
-          { element: e, context: context }
+          `unrecognized flowElement ${ elementToString(flowElement) } in context ${ elementToString(context && context.businessObject) }`,
+          {
+            element: flowElement,
+            context
+          }
         );
       }
     });

package/lib/import/Importer.js

@@ -35,7 +35,6 @@ export function importBpmnDiagram(diagram, definitions, bpmnDiagram) {
 
   var importer,
       eventBus,
-      translate,
       canvas;
 
   var error,
@@ -65,7 +64,7 @@ export function importBpmnDiagram(diagram, definitions, bpmnDiagram) {
       }
     };
 
-    var walker = new BpmnTreeWalker(visitor, translate);
+    var walker = new BpmnTreeWalker(visitor);
 
 
     bpmnDiagram = bpmnDiagram || (definitions.diagrams && definitions.diagrams[0]);
@@ -73,7 +72,7 @@ export function importBpmnDiagram(diagram, definitions, bpmnDiagram) {
     var diagramsToImport = getDiagramsToImport(definitions, bpmnDiagram);
 
     if (!diagramsToImport) {
-      throw new Error(translate('no diagram to display'));
+      throw new Error('no diagram to display');
     }
 
     // traverse BPMN 2.0 document model,
@@ -96,7 +95,6 @@ export function importBpmnDiagram(diagram, definitions, bpmnDiagram) {
     try {
       importer = diagram.get('bpmnImporter');
       eventBus = diagram.get('eventBus');
-      translate = diagram.get('translate');
       canvas = diagram.get('canvas');
 
       eventBus.fire('import.render.start', { definitions: definitions });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "17.4.0",
+  "version": "17.5.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -113,7 +113,7 @@
   "dependencies": {
     "bpmn-moddle": "^8.1.0",
     "diagram-js": "^14.4.1",
-    "diagram-js-direct-editing": "^2.1.2",
+    "diagram-js-direct-editing": "^3.0.1",
     "ids": "^1.0.5",
     "inherits-browser": "^0.1.0",
     "min-dash": "^4.1.1",