mirror of
https://github.com/sartography/bpmn-js.git
synced 2025-01-11 09:36:07 +00:00
chore(project): bump bpmn-moddle dep
This improves the import and export of BPMN 2.0 XML documents + improves di prefix collision handling + proper deconflicting of prefixes during export + validate and detect non-BPMN root elements + replace underlying XML parser for higher speed and smaller bundle size + pass parse warnings with errors NOTE: * some error messages on broken XML may have changed due to changes in the underlying XML parser
This commit is contained in:
Nico Rehwaldt
parent
0227eb2d3c
commit
ce45e9081b
@ -167,16 +167,16 @@ Viewer.prototype.importXML = function(xml, done) {
|
||||
context: context
|
||||
}) || definitions;
|
||||
|
||||
var parseWarnings = context.warnings;
|
||||
|
||||
if (err) {
|
||||
err = checkValidationError(err);
|
||||
|
||||
self._emit('import.done', { error: err });
|
||||
self._emit('import.done', { error: err, warnings: parseWarnings });
|
||||
|
||||
return done(err);
|
||||
return done(err, parseWarnings);
|
||||
}
|
||||
|
||||
var parseWarnings = context.warnings;
|
||||
|
||||
self.importDefinitions(definitions, function(err, importWarnings) {
|
||||
var allWarnings = [].concat(parseWarnings, importWarnings || []);
|
||||
|
||||
|
||||
942
package-lock.json
generated
942
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -73,7 +73,7 @@
|
||||
"watchify": "^3.7.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"bpmn-moddle": "^0.14.1",
|
||||
"bpmn-moddle": "^1.1.0",
|
||||
"diagram-js": "^0.22.1",
|
||||
"diagram-js-direct-editing": "^0.19.0",
|
||||
"diagram-js-origin": "^0.15.2",
|
||||
|
||||
2
test/fixtures/bpmn/extension/camunda.bpmn
vendored
2
test/fixtures/bpmn/extension/camunda.bpmn
vendored
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://activiti.org/bpmn">
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
|
||||
<bpmn2:process id="testProcess" isExecutable="true">
|
||||
<bpmn2:startEvent id="StartEvent_1">
|
||||
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:custom="http://customdescriptor.com/bpmn2" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://activiti.org/bpmn">
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:custom="http://customdescriptor.com/bpmn2" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://activiti.org/bpmn">
|
||||
<bpmn2:process id="testProcess" isExecutable="true">
|
||||
<bpmn2:startEvent id="StartEvent_1">
|
||||
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
|
||||
|
||||
2
test/fixtures/bpmn/extension/custom.bpmn
vendored
2
test/fixtures/bpmn/extension/custom.bpmn
vendored
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:custom="http://customdescriptor.com/bpmn2" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://activiti.org/bpmn">
|
||||
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:custom="http://customdescriptor.com/bpmn2" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FVEpwO_VEeOtYvXzz5ksgw" exporter="camunda modeler" exporterVersion="2.5.0" targetNamespace="http://activiti.org/bpmn">
|
||||
<bpmn2:process id="testProcess" isExecutable="true">
|
||||
<bpmn2:startEvent id="StartEvent_1">
|
||||
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
|
||||
|
||||
@ -139,7 +139,7 @@ describe('Viewer', function() {
|
||||
|
||||
expect(err).to.exist;
|
||||
|
||||
expectMessage(err, /Text data outside of root node./);
|
||||
expectMessage(err, /missing start tag/);
|
||||
|
||||
done();
|
||||
});
|
||||
@ -198,14 +198,10 @@ describe('Viewer', function() {
|
||||
|
||||
// then
|
||||
expect(err).to.exist;
|
||||
expect(err.message).to.eql('no process or collaboration to display');
|
||||
expect(err.message).to.eql('failed to parse document as <bpmn:Definitions>');
|
||||
|
||||
expectWarnings(warnings, [
|
||||
/unparsable content <collaboration> detected/,
|
||||
'unresolved reference <Participant_1>',
|
||||
'no bpmnElement referenced in <bpmndi:BPMNPlane id="BPMNPlane_1" />',
|
||||
'no bpmnElement referenced in <bpmndi:BPMNShape id="BPMNShape_Participant_1" />'
|
||||
]);
|
||||
expect(warnings).to.have.length(1);
|
||||
expect(warnings[0].message).to.match(/unparsable content <definitions> detected/);
|
||||
|
||||
done();
|
||||
});
|
||||
@ -566,8 +562,9 @@ describe('Viewer', function() {
|
||||
|
||||
// extension elements should provide typed element
|
||||
expect(extensionElements).to.exist;
|
||||
expect(extensionElements.values).to.exist;
|
||||
|
||||
expect(extensionElements.values.length).to.equal(1);
|
||||
expect(extensionElements.values).to.have.length(1);
|
||||
expect(extensionElements.values[0].$instanceOf('camunda:InputOutput')).to.be.true;
|
||||
|
||||
done(err);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user