bpmn-js 0.30.0 → 0.31.0

package/CHANGELOG.md

@@ -6,6 +6,12 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
 
 ___Note:__ Yet to be released changes appear here._
 
+## 0.31.0
+
+* `FEAT`: encode entities in body properties during XML export
+* `CHORE`: bump to [`bpmn-moddle@4.0.0`](https://github.com/bpmn-io/bpmn-moddle/releases/tag/v4.0.0)
+* `CHORE`: bump utility version
+
 ## 0.30.0
 
 * `CHORE`: bump to [`diagram-js@0.31.0`](https://github.com/bpmn-io/diagram-js/releases/tag/v0.31.0)

package/dist/bpmn-modeler.development.js

@@ -1,5 +1,5 @@
 /*!
- * bpmn-js - bpmn-modeler v0.30.0
+ * bpmn-js - bpmn-modeler v0.31.0
  *
  * Copyright (c) 2014-present, camunda Services GmbH
  *
@@ -8,7 +8,7 @@
  *
  * Source Code: https://github.com/bpmn-io/bpmn-js
  *
- * Date: 2018-04-01
+ * Date: 2018-04-02
  */
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.BpmnJS = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(_dereq_,module,exports){
 'use strict';
@@ -46436,7 +46436,8 @@ var Types = _dereq_(297),
     serializeAsProperty = common.serializeAsProperty;
 
 var XML_PREAMBLE = '<?xml version="1.0" encoding="UTF-8"?>\n',
-    ESCAPE_CHARS = /(<|>|'|"|&|\n\r|\n)/g,
+    ESCAPE_ATTR_CHARS = /<|>|'|"|&|\n\r|\n/g,
+    ESCAPE_CHARS =  /<|>|&/g,
     DEFAULT_NS_MAP = common.DEFAULT_NS_MAP,
     XSI_TYPE = common.XSI_TYPE;
 
@@ -46582,16 +46583,32 @@ function getSerializableProperties(element) {
   });
 }
 
+var ESCAPE_ATTR_MAP = {
+  '\n': '#10',
+  '\n\r': '#10',
+  '"': '#34',
+  '\'': '#39',
+  '<': '#60',
+  '>': '#62',
+  '&': '#38'
+};
+
 var ESCAPE_MAP = {
-  '\n': '10',
-  '\n\r': '10',
-  '"': '34',
-  '\'': '39',
-  '<': '60',
-  '>': '62',
-  '&': '38'
+  '<': 'lt',
+  '>': 'gt',
+  '&': 'amp'
 };
 
+function escape(str, charPattern, replaceMap) {
+
+  // ensure we are handling strings here
+  str = isString(str) ? str : '' + str;
+
+  return str.replace(charPattern, function(s) {
+    return '&' + replaceMap[s] + ';';
+  });
+}
+
 /**
  * Escape a string attribute to not contain any bad values (line breaks, '"', ...)
  *
@@ -46599,13 +46616,11 @@ var ESCAPE_MAP = {
  * @return {String} the escaped string
  */
 function escapeAttr(str) {
+  return escape(str, ESCAPE_ATTR_CHARS, ESCAPE_ATTR_MAP);
+}
 
-  // ensure we are handling strings here
-  str = isString(str) ? str : '' + str;
-
-  return str.replace(ESCAPE_CHARS, function(str) {
-    return '&#' + ESCAPE_MAP[str] + ';';
-  });
+function escapeBody(str) {
+  return escape(str, ESCAPE_CHARS, ESCAPE_MAP);
 }
 
 function filterAttributes(props) {
@@ -46635,18 +46650,13 @@ ReferenceSerializer.prototype.serializeTo = function(writer) {
 
 function BodySerializer() {}
 
-BodySerializer.prototype.serializeValue = BodySerializer.prototype.serializeTo = function(writer) {
-  var escape = this.escape;
-
-  if (escape) {
-    writer.append('<![CDATA[');
-  }
-
-  writer.append(this.value);
-
-  if (escape) {
-    writer.append(']]>');
-  }
+BodySerializer.prototype.serializeValue =
+BodySerializer.prototype.serializeTo = function(writer) {
+  writer.append(
+    this.escape
+      ? escapeBody(this.value)
+      : this.value
+  );
 };
 
 BodySerializer.prototype.build = function(prop, value) {