@logicflow/extension 2.1.13 → 2.1.14

package/es/bpmn-elements-adapter/json2xml.d.ts

@@ -1,3 +1,4 @@
 declare function handleAttributes(obj: any): any;
+declare function escapeXml(text: string): string;
 declare function lfJson2Xml(obj: any): string;
-export { lfJson2Xml, handleAttributes };
+export { lfJson2Xml, handleAttributes, escapeXml };

package/es/bpmn-elements-adapter/json2xml.js

@@ -21,6 +21,17 @@ function handleAttributes(obj) {
     }
     return obj;
 }
+function escapeXml(text) {
+    if (text == null)
+        return '';
+    return text
+        .toString()
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;');
+}
 function getAttributes(obj) {
     var tmp = obj;
     try {
@@ -31,7 +42,7 @@ function getAttributes(obj) {
     catch (error) {
         tmp = JSON.stringify(handleAttributes(obj)).replace(/"/g, "'");
     }
-    return tmp;
+    return escapeXml(String(tmp));
 }
 var tn = '\t\n';
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
@@ -42,7 +53,7 @@ function toXml(obj, name, depth) {
     if (name === '-json')
         return '';
     if (name === '#text') {
-        return prefix + obj;
+        return prefix + escapeXml(String(obj));
     }
     if (name === '#cdata-section') {
         return "".concat(prefix, "<![CDATA[").concat(obj, "]]>");
@@ -50,6 +61,9 @@ function toXml(obj, name, depth) {
     if (name === '#comment') {
         return "".concat(prefix, "<!--").concat(obj, "-->");
     }
+    if (obj !== 0 && obj !== false && !obj) {
+        return "".concat(prefix, "<").concat(name, " />");
+    }
     if ("".concat(name).charAt(0) === '-') {
         return " ".concat(name.substring(1), "=\"").concat(getAttributes(obj), "\"");
     }
@@ -70,7 +84,7 @@ function toXml(obj, name, depth) {
             attributes_1 + (children_1 !== '' ? ">".concat(children_1).concat(prefix, "</").concat(name, ">") : ' />');
     }
     else {
-        str += "".concat(prefix, "<").concat(name, ">").concat(obj.toString(), "</").concat(name, ">");
+        str += "".concat(prefix, "<").concat(name, ">").concat(escapeXml(String(obj)), "</").concat(name, ">");
     }
     return str;
 }
@@ -81,4 +95,4 @@ function lfJson2Xml(obj) {
     }
     return xmlStr;
 }
-export { lfJson2Xml, handleAttributes };
+export { lfJson2Xml, handleAttributes, escapeXml };

package/es/bpmn-elements-adapter/xml2json.js

@@ -5,6 +5,7 @@
 /* eslint-disable func-names */
 // @ts-nocheck
 import { has } from 'lodash-es';
+import { escapeXml } from './json2xml';
 // ========================================================================
 //  XML.ObjTree -- XML source code from/to JavaScript object like E4X
 // ========================================================================
@@ -295,13 +296,7 @@ XML.ObjTree.prototype.scalar_to_xml = function (name, text) {
     return "<".concat(name, ">").concat(this.xml_escape(text), "</").concat(name, ">\n");
 };
 //  method: xml_escape( text )
-XML.ObjTree.prototype.xml_escape = function (text) {
-    return text
-        .replace(/&/g, '&')
-        .replace(/</g, '<')
-        .replace(/>/g, '>')
-        .replace(/"/g, '"');
-};
+XML.ObjTree.prototype.xml_escape = escapeXml;
 /*
 // ========================================================================
 

package/lib/bpmn-elements-adapter/json2xml.d.ts

@@ -1,3 +1,4 @@
 declare function handleAttributes(obj: any): any;
+declare function escapeXml(text: string): string;
 declare function lfJson2Xml(obj: any): string;
-export { lfJson2Xml, handleAttributes };
+export { lfJson2Xml, handleAttributes, escapeXml };

package/lib/bpmn-elements-adapter/json2xml.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAttributes = exports.lfJson2Xml = void 0;
+exports.escapeXml = exports.handleAttributes = exports.lfJson2Xml = void 0;
 /* eslint-disable guard-for-in */
 function type(obj) {
     return Object.prototype.toString.call(obj);
@@ -25,6 +25,18 @@ function handleAttributes(obj) {
     return obj;
 }
 exports.handleAttributes = handleAttributes;
+function escapeXml(text) {
+    if (text == null)
+        return '';
+    return text
+        .toString()
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;');
+}
+exports.escapeXml = escapeXml;
 function getAttributes(obj) {
     var tmp = obj;
     try {
@@ -35,7 +47,7 @@ function getAttributes(obj) {
     catch (error) {
         tmp = JSON.stringify(handleAttributes(obj)).replace(/"/g, "'");
     }
-    return tmp;
+    return escapeXml(String(tmp));
 }
 var tn = '\t\n';
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
@@ -46,7 +58,7 @@ function toXml(obj, name, depth) {
     if (name === '-json')
         return '';
     if (name === '#text') {
-        return prefix + obj;
+        return prefix + escapeXml(String(obj));
     }
     if (name === '#cdata-section') {
         return "".concat(prefix, "<![CDATA[").concat(obj, "]]>");
@@ -54,6 +66,9 @@ function toXml(obj, name, depth) {
     if (name === '#comment') {
         return "".concat(prefix, "<!--").concat(obj, "-->");
     }
+    if (obj !== 0 && obj !== false && !obj) {
+        return "".concat(prefix, "<").concat(name, " />");
+    }
     if ("".concat(name).charAt(0) === '-') {
         return " ".concat(name.substring(1), "=\"").concat(getAttributes(obj), "\"");
     }
@@ -74,7 +89,7 @@ function toXml(obj, name, depth) {
             attributes_1 + (children_1 !== '' ? ">".concat(children_1).concat(prefix, "</").concat(name, ">") : ' />');
     }
     else {
-        str += "".concat(prefix, "<").concat(name, ">").concat(obj.toString(), "</").concat(name, ">");
+        str += "".concat(prefix, "<").concat(name, ">").concat(escapeXml(String(obj)), "</").concat(name, ">");
     }
     return str;
 }

package/lib/bpmn-elements-adapter/xml2json.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lfXml2Json = void 0;
 var lodash_es_1 = require("lodash-es");
+var json2xml_1 = require("./json2xml");
 // ========================================================================
 //  XML.ObjTree -- XML source code from/to JavaScript object like E4X
 // ========================================================================
@@ -298,13 +299,7 @@ XML.ObjTree.prototype.scalar_to_xml = function (name, text) {
     return "<".concat(name, ">").concat(this.xml_escape(text), "</").concat(name, ">\n");
 };
 //  method: xml_escape( text )
-XML.ObjTree.prototype.xml_escape = function (text) {
-    return text
-        .replace(/&/g, '&')
-        .replace(/</g, '<')
-        .replace(/>/g, '>')
-        .replace(/"/g, '"');
-};
+XML.ObjTree.prototype.xml_escape = json2xml_1.escapeXml;
 /*
 // ========================================================================
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/bpmn-elements-adapter/json2xml.ts

@@ -24,6 +24,17 @@ function handleAttributes(obj: any): any {
   return obj
 }
 
+function escapeXml(text: string) {
+  if (text == null) return ''
+  return text
+    .toString()
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&apos;')
+}
+
 function getAttributes(obj: any) {
   let tmp = obj
   try {
@@ -33,7 +44,7 @@ function getAttributes(obj: any) {
   } catch (error) {
     tmp = JSON.stringify(handleAttributes(obj)).replace(/"/g, "'")
   }
-  return tmp
+  return escapeXml(String(tmp))
 }
 
 const tn = '\t\n'
@@ -45,7 +56,7 @@ function toXml(obj: any, name: string, depth: number) {
   const prefix = tn + frontSpace
   if (name === '-json') return ''
   if (name === '#text') {
-    return prefix + obj
+    return prefix + escapeXml(String(obj))
   }
   if (name === '#cdata-section') {
     return `${prefix}<![CDATA[${obj}]]>`
@@ -53,6 +64,9 @@ function toXml(obj: any, name: string, depth: number) {
   if (name === '#comment') {
     return `${prefix}<!--${obj}-->`
   }
+  if (obj !== 0 && obj !== false && !obj) {
+    return `${prefix}<${name} />`
+  }
   if (`${name}`.charAt(0) === '-') {
     return ` ${name.substring(1)}="${getAttributes(obj)}"`
   }
@@ -74,7 +88,7 @@ function toXml(obj: any, name: string, depth: number) {
     str +=
       attributes + (children !== '' ? `>${children}${prefix}</${name}>` : ' />')
   } else {
-    str += `${prefix}<${name}>${obj.toString()}</${name}>`
+    str += `${prefix}<${name}>${escapeXml(String(obj))}</${name}>`
   }
 
   return str
@@ -88,4 +102,4 @@ function lfJson2Xml(obj: any) {
   return xmlStr
 }
 
-export { lfJson2Xml, handleAttributes }
+export { lfJson2Xml, handleAttributes, escapeXml }

package/src/bpmn-elements-adapter/xml2json.ts

@@ -6,6 +6,7 @@
 // @ts-nocheck
 
 import { has } from 'lodash-es'
+import { escapeXml } from './json2xml'
 // ========================================================================
 //  XML.ObjTree -- XML source code from/to JavaScript object like E4X
 // ========================================================================
@@ -287,14 +288,7 @@ XML.ObjTree.prototype.scalar_to_xml = function (name, text) {
 }
 
 //  method: xml_escape( text )
-
-XML.ObjTree.prototype.xml_escape = function (text) {
-  return text
-    .replace(/&/g, '&')
-    .replace(/</g, '<')
-    .replace(/>/g, '>')
-    .replace(/"/g, '"')
-}
+XML.ObjTree.prototype.xml_escape = escapeXml
 
 /*
 // ========================================================================