bpmn-js 3.4.3 → 3.5.0

package/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
 
 ___Note:__ Yet to be released changes appear here._
 
+## 3.5.0
+
+* `FEAT`: restore `Viewer#importDefinitions` and make it public API ([#1112](https://github.com/bpmn-io/bpmn-js/pull/1112))
+
 ## 3.4.3
 
 * `FIX`: prevent HTML injection in search ([diagram-js#362](https://github.com/bpmn-io/diagram-js/pull/362))

package/dist/bpmn-modeler.development.js

@@ -1,5 +1,5 @@
 /*!
- * bpmn-js - bpmn-modeler v3.4.3
+ * bpmn-js - bpmn-modeler v3.5.0
  *
  * Copyright (c) 2014-present, camunda Services GmbH
  *
@@ -8,7 +8,7 @@
  *
  * Source Code: https://github.com/bpmn-io/bpmn-js
  *
- * Date: 2019-06-13
+ * Date: 2019-06-28
  */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -220,41 +220,49 @@
 
 	var nativeToString = Object.prototype.toString;
 	var nativeHasOwnProperty = Object.prototype.hasOwnProperty;
+
 	function isUndefined(obj) {
 	  return obj === undefined;
 	}
+
 	function isDefined(obj) {
 	  return obj !== undefined;
 	}
+
 	function isArray(obj) {
 	  return nativeToString.call(obj) === '[object Array]';
 	}
+
 	function isObject(obj) {
 	  return nativeToString.call(obj) === '[object Object]';
 	}
+
 	function isNumber(obj) {
 	  return nativeToString.call(obj) === '[object Number]';
 	}
+
 	function isFunction(obj) {
-	  var tag = nativeToString.call(obj);
-	  return tag === '[object Function]' || tag === '[object AsyncFunction]' || tag === '[object GeneratorFunction]' || tag === '[object AsyncGeneratorFunction]' || tag === '[object Proxy]';
+	  return nativeToString.call(obj) === '[object Function]';
 	}
+
 	function isString(obj) {
 	  return nativeToString.call(obj) === '[object String]';
 	}
+
 	/**
 	 * Ensure collection is an array.
 	 *
 	 * @param {Object} obj
 	 */
-
 	function ensureArray(obj) {
+
 	  if (isArray(obj)) {
 	    return;
 	  }
 
 	  throw new Error('must supply array');
 	}
+
 	/**
 	 * Return true, if target owns a property with the given key.
 	 *
@@ -263,7 +271,6 @@
 	 *
 	 * @return {Boolean}
 	 */
-
 	function has(target, key) {
 	  return nativeHasOwnProperty.call(target, key);
 	}
@@ -276,18 +283,23 @@
 	 *
 	 * @return {Object}
 	 */
-
 	function find(collection, matcher) {
+
 	  matcher = toMatcher(matcher);
+
 	  var match;
+
 	  forEach(collection, function (val, key) {
 	    if (matcher(val, key)) {
 	      match = val;
+
 	      return false;
 	    }
 	  });
+
 	  return match;
 	}
+
 	/**
 	 * Find element index in collection.
 	 *
@@ -296,18 +308,23 @@
 	 *
 	 * @return {Object}
 	 */
-
 	function findIndex(collection, matcher) {
+
 	  matcher = toMatcher(matcher);
+
 	  var idx = isArray(collection) ? -1 : undefined;
+
 	  forEach(collection, function (val, key) {
 	    if (matcher(val, key)) {
 	      idx = key;
+
 	      return false;
 	    }
 	  });
+
 	  return idx;
 	}
+
 	/**
 	 * Find element in collection.
 	 *
@@ -316,16 +333,19 @@
 	 *
 	 * @return {Array} result
 	 */
-
 	function filter(collection, matcher) {
+
 	  var result = [];
+
 	  forEach(collection, function (val, key) {
 	    if (matcher(val, key)) {
 	      result.push(val);
 	    }
 	  });
+
 	  return result;
 	}
+
 	/**
 	 * Iterate over collection; returning something
 	 * (non-undefined) will stop iteration.
@@ -335,9 +355,7 @@
 	 *
 	 * @return {Object} return result that stopped the iteration
 	 */
-
 	function forEach(collection, iterator) {
-	  var val, result;
 
 	  if (isUndefined(collection)) {
 	    return;
@@ -346,16 +364,19 @@
 	  var convertKey = isArray(collection) ? toNum : identity;
 
 	  for (var key in collection) {
+
 	    if (has(collection, key)) {
-	      val = collection[key];
-	      result = iterator(val, convertKey(key));
+	      var val = collection[key];
+
+	      var result = iterator(val, convertKey(key));
 
 	      if (result === false) {
-	        return val;
+	        return;
 	      }
 	    }
 	  }
 	}
+
 	/**
 	 * Return collection without element.
 	 *
@@ -364,18 +385,21 @@
 	 *
 	 * @return {Array}
 	 */
-
 	function without(arr, matcher) {
+
 	  if (isUndefined(arr)) {
 	    return [];
 	  }
 
 	  ensureArray(arr);
+
 	  matcher = toMatcher(matcher);
+
 	  return arr.filter(function (el, idx) {
 	    return !matcher(el, idx);
 	  });
 	}
+
 	/**
 	 * Reduce collection, returning a single result.
 	 *
@@ -385,13 +409,15 @@
 	 *
 	 * @return {Any} result returned from last iterator
 	 */
-
 	function reduce(collection, iterator, result) {
+
 	  forEach(collection, function (value, idx) {
 	    result = iterator(result, value, idx);
 	  });
+
 	  return result;
 	}
+
 	/**
 	 * Return true if every element in the collection
 	 * matches the criteria.
@@ -401,12 +427,13 @@
 	 *
 	 * @return {Boolean}
 	 */
-
 	function every(collection, matcher) {
+
 	  return reduce(collection, function (matches, val, key) {
 	    return matches && matcher(val, key);
 	  }, true);
 	}
+
 	/**
 	 * Return true if some elements in the collection
 	 * match the criteria.
@@ -416,10 +443,11 @@
 	 *
 	 * @return {Boolean}
 	 */
-
 	function some(collection, matcher) {
+
 	  return !!find(collection, matcher);
 	}
+
 	/**
 	 * Transform a collection into another collection
 	 * by piping each member through the given fn.
@@ -429,14 +457,17 @@
 	 *
 	 * @return {Array} transformed collection
 	 */
-
 	function map(collection, fn) {
+
 	  var result = [];
+
 	  forEach(collection, function (val, key) {
 	    result.push(fn(val, key));
 	  });
+
 	  return result;
 	}
+
 	/**
 	 * Get the collections keys.
 	 *
@@ -444,10 +475,10 @@
 	 *
 	 * @return {Array}
 	 */
-
 	function keys(collection) {
 	  return collection && Object.keys(collection) || [];
 	}
+
 	/**
 	 * Shorthand for `keys(o).length`.
 	 *
@@ -455,10 +486,10 @@
 	 *
 	 * @return {Number}
 	 */
-
 	function size(collection) {
 	  return keys(collection).length;
 	}
+
 	/**
 	 * Get the values in the collection.
 	 *
@@ -466,12 +497,12 @@
 	 *
 	 * @return {Array}
 	 */
-
 	function values(collection) {
 	  return map(collection, function (val) {
 	    return val;
 	  });
 	}
+
 	/**
 	 * Group collection members by attribute.
 	 *
@@ -480,12 +511,15 @@
 	 *
 	 * @return {Object} map with { attrValue => [ a, b, c ] }
 	 */
-
 	function groupBy(collection, extractor) {
 	  var grouped = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+
 	  extractor = toExtractor(extractor);
+
 	  forEach(collection, function (val) {
 	    var discriminator = extractor(val) || '_';
+
 	    var group = grouped[discriminator];
 
 	    if (!group) {
@@ -494,25 +528,33 @@
 
 	    group.push(val);
 	  });
+
 	  return grouped;
 	}
+
 	function uniqueBy(extractor) {
+
 	  extractor = toExtractor(extractor);
+
 	  var grouped = {};
 
-	  for (var _len = arguments.length, collections = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+	  for (var _len = arguments.length, collections = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
 	    collections[_key - 1] = arguments[_key];
 	  }
 
 	  forEach(collections, function (c) {
 	    return groupBy(c, extractor, grouped);
 	  });
+
 	  var result = map(grouped, function (val, key) {
 	    return val[0];
 	  });
+
 	  return result;
 	}
+
 	var unionBy = uniqueBy;
+
 	/**
 	 * Sort collection by criteria.
 	 *
@@ -521,12 +563,15 @@
 	 *
 	 * @return {Array}
 	 */
-
 	function sortBy(collection, extractor) {
+
 	  extractor = toExtractor(extractor);
+
 	  var sorted = [];
+
 	  forEach(collection, function (value, key) {
 	    var disc = extractor(value, key);
+
 	    var entry = {
 	      d: disc,
 	      v: value
@@ -535,19 +580,22 @@
 	    for (var idx = 0; idx < sorted.length; idx++) {
 	      var d = sorted[idx].d;
 
+
 	      if (disc < d) {
 	        sorted.splice(idx, 0, entry);
 	        return;
 	      }
-	    } // not inserted, append (!)
-
+	    }
 
+	    // not inserted, append (!)
 	    sorted.push(entry);
 	  });
+
 	  return map(sorted, function (e) {
 	    return e.v;
 	  });
 	}
+
 	/**
 	 * Create an object pattern matcher.
 	 *
@@ -561,9 +609,10 @@
 	 *
 	 * @return {Function} matcherFn
 	 */
-
 	function matchPattern(pattern) {
+
 	  return function (el) {
+
 	    return every(pattern, function (val, key) {
 	      return el[key] === val;
 	    });
@@ -600,13 +649,18 @@
 	 * @return {Function} debounced function
 	 */
 	function debounce(fn, timeout) {
+
 	  var timer;
+
 	  var lastArgs;
 	  var lastThis;
+
 	  var lastNow;
 
 	  function fire() {
+
 	    var now = Date.now();
+
 	    var scheduledDiff = lastNow + timeout - now;
 
 	    if (scheduledDiff > 0) {
@@ -614,6 +668,7 @@
 	    }
 
 	    fn.apply(lastThis, lastArgs);
+
 	    timer = lastNow = lastArgs = lastThis = undefined;
 	  }
 
@@ -622,20 +677,23 @@
 	  }
 
 	  return function () {
+
 	    lastNow = Date.now();
 
-	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
 	      args[_key] = arguments[_key];
 	    }
 
 	    lastArgs = args;
-	    lastThis = this; // ensure an execution is scheduled
+	    lastThis = this;
 
+	    // ensure an execution is scheduled
 	    if (!timer) {
 	      schedule(timeout);
 	    }
 	  };
 	}
+
 	/**
 	 * Bind function against target <this>.
 	 *
@@ -644,28 +702,11 @@
 	 *
 	 * @return {Function} bound function
 	 */
-
 	function bind(fn, target) {
 	  return fn.bind(target);
 	}
 
-	function _extends() {
-	  _extends = Object.assign || function (target) {
-	    for (var i = 1; i < arguments.length; i++) {
-	      var source = arguments[i];
-
-	      for (var key in source) {
-	        if (Object.prototype.hasOwnProperty.call(source, key)) {
-	          target[key] = source[key];
-	        }
-	      }
-	    }
-
-	    return target;
-	  };
-
-	  return _extends.apply(this, arguments);
-	}
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 	/**
 	 * Convenience wrapper for `Object.assign`.
@@ -675,14 +716,14 @@
 	 *
 	 * @return {Object} the target
 	 */
-
 	function assign(target) {
-	  for (var _len = arguments.length, others = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+	  for (var _len = arguments.length, others = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
 	    others[_key - 1] = arguments[_key];
 	  }
 
-	  return _extends.apply(void 0, [target].concat(others));
+	  return _extends.apply(undefined, [target].concat(others));
 	}
+
 	/**
 	 * Pick given properties from the target object.
 	 *
@@ -691,17 +732,22 @@
 	 *
 	 * @return {Object} target
 	 */
-
 	function pick(target, properties) {
+
 	  var result = {};
+
 	  var obj = Object(target);
+
 	  forEach(properties, function (prop) {
+
 	    if (prop in obj) {
 	      result[prop] = target[prop];
 	    }
 	  });
+
 	  return result;
 	}
+
 	/**
 	 * Pick all target properties, excluding the given ones.
 	 *
@@ -710,15 +756,19 @@
 	 *
 	 * @return {Object} target
 	 */
-
 	function omit(target, properties) {
+
 	  var result = {};
+
 	  var obj = Object(target);
+
 	  forEach(obj, function (prop, key) {
+
 	    if (properties.indexOf(key) === -1) {
 	      result[key] = prop;
 	    }
 	  });
+
 	  return result;
 	}
 
@@ -20210,9 +20260,7 @@
 	      return done(err, parseWarnings);
 	    }
 
-	    self._setDefinitions(definitions);
-
-	    self.open(bpmnDiagram, function(err, importWarnings) {
+	    self.importDefinitions(definitions, bpmnDiagram, function(err, importWarnings) {
 	      var allWarnings = [].concat(parseWarnings, importWarnings || []);
 
 	      self._emit('import.done', { error: err, warnings: allWarnings });
@@ -20222,6 +20270,40 @@
 	  });
 	};
 
+	/**
+	 * Import parsed definitions and render a BPMN 2.0 diagram.
+	 *
+	 * Once finished the viewer reports back the result to the
+	 * provided callback function with (err, warnings).
+	 *
+	 * ## Life-Cycle Events
+	 *
+	 * During import the viewer will fire life-cycle events:
+	 *
+	 *   * import.render.start (graphical import start)
+	 *   * import.render.complete (graphical import finished)
+	 *
+	 * You can use these events to hook into the life-cycle.
+	 *
+	 * @param {ModdleElement<Definitions>} definitions parsed BPMN 2.0 definitions
+	 * @param {ModdleElement<BPMNDiagram>|String} [bpmnDiagram] BPMN diagram or id of diagram to render (if not provided, the first one will be rendered)
+	 * @param {Function} [done] invoked with (err, warnings=[])
+	 */
+	Viewer.prototype.importDefinitions = function(definitions, bpmnDiagram, done) {
+
+	  if (isFunction(bpmnDiagram)) {
+	    done = bpmnDiagram;
+	    bpmnDiagram = null;
+	  }
+
+	  // done is optional
+	  done = done || function() {};
+
+	  this._setDefinitions(definitions);
+
+	  return this.open(bpmnDiagram, done);
+	};
+
 	/**
 	 * Open diagram of previously imported XML.
 	 *