dmn-moddle - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

lib/dmn-moddle.js

@@ -43,3 +43,3 @@ 'use strict';
     options = typeName;
-    typeName = 'Definitions';
+    typeName = 'definitions';
   }
@@ -46,0 +46,0 @@

package.json

 {
   "name": "dmn-moddle",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A moddle wrapper for DMN 1.0",
@@ -5,0 +5,0 @@ "repository": {

resources/dmn/json/dmn.json

@@ -11,6 +11,13 @@ {
         { "name": "id", "type": "String", "isAttr": true },
-        { "name": "name", "type": "String", "isAttr": true }
+        { "name": "label", "type": "String", "isAttr": true }
       ]
     },
     {
+      "name": "NamedElement",
+      "superClass": [ "DMNElement" ],
+      "properties": [
+        { "name": "name", "type": "String", "isAttr": true}
+      ]
+    },
+    {
       "name": "DMNElementReference",
@@ -22,4 +29,4 @@ "properties": [
     {
-      "name": "Definitions",
-      "superClass": [ "DMNElement" ],
+      "name": "definitions",
+      "superClass": [ "NamedElement" ],
       "properties": [
@@ -29,4 +36,4 @@ { "name": "namespace", "type": "String", "isAttr": true },
         { "name": "expressionLanguage", "type": "String", "isAttr": true, "default": "http://www.omg.org/spec/FEEL/20140401" },
-        { "name": "ItemDefinition", "type": "ItemDefinition", "isMany": true },
-        { "name": "Decision", "type": "Decision", "isMany": true }
+        { "name": "itemDefinition", "type": "ItemDefinition", "isMany": true, "xml": { "serialize": "property" } },
+        { "name": "decision", "type": "Decision", "isMany": true, "xml": { "serialize": "property" } }
       ]
@@ -36,5 +43,4 @@ },
       "name": "ItemDefinition",
-      "superClass": [ "DMNElement" ],
+      "superClass": [ "NamedElement" ],
       "properties": [
-        { "name": "typeDefinition", "type": "String" },
         { "name": "typeLanguage", "type": "String", "isAttr": true },
@@ -50,4 +56,3 @@ { "name": "isCollection", "type": "Boolean", "isAttr": true, "default": false },
       "properties": [
-        { "name": "inputVariable", "type": "DMNElement", "isReference": true},
-        { "name": "itemDefinition", "type": "DMNElementReference", "xml": { "serialize": "property" } }
+        { "name": "typeRef", "type": "String", "isAttr": true }
       ]
@@ -65,3 +70,3 @@ },
       "name": "DRGElement",
-      "superClass": [ "DMNElement" ],
+      "superClass": [ "NamedElement" ],
       "properties": []
@@ -75,4 +80,3 @@ },
         { "name": "allowedAnswers", "type": "String", "isAttr": true },
-        { "name": "DecisionTable", "type": "DecisionTable" },
-        { "name": "outputDefinition", "type": "DMNElementReference", "xml": { "serialize": "property" } }
+        { "name": "decisionTable", "type": "DecisionTable", "xml": { "serialize": "property" } }
       ]
@@ -84,27 +88,43 @@ },
       "properties": [
+        { "name": "input", "type": "InputClause", "isMany": true, "xml": { "serialize": "property" } },
+        { "name": "output", "type": "OutputClause", "isMany": true, "xml": { "serialize": "property" } },
+        { "name": "rule", "type": "DecisionRule", "isMany": true, "xml": { "serialize": "property" } },
         { "name": "hitPolicy", "type": "HitPolicy", "isAttr": true , "default": "UNIQUE" },
         { "name": "aggregation", "type": "BuiltinAggregator", "isAttr": true },
-        { "name": "preferredOrientation", "type": "DecisionTableOrientation", "isAttr": true },
-        { "name": "isComplete", "type": "Boolean", "isAttr": true, "default": false },
-        { "name": "isConsistent", "type": "Boolean", "isAttr": true, "default": false },
-        { "name": "clause", "type": "Clause", "isMany": true, "xml": { "serialize": "property" } },
-        { "name": "rule", "type": "DecisionRule", "isMany": true, "xml": { "serialize": "property" } }
+        { "name": "preferredOrientation", "type": "DecisionTableOrientation", "isAttr": true, "default": "Rule-as-Row" },
+        { "name": "outputLabel", "type": "String", "isAttr": true }
       ]
     },
     {
-      "name": "Clause",
+      "name": "InputClause",
       "superClass": [ "DMNElement" ],
       "properties": [
-        { "name": "inputExpression", "type": "LiteralExpression", "xml": { "serialize": "property" }  },
-        { "name": "outputDefinition", "type": "DMNElementReference", "xml": { "serialize": "property" }  },
-        { "name": "inputEntry", "type": "LiteralExpression", "isMany": true, "xml": { "serialize": "property" } },
-        { "name": "outputEntry", "type": "LiteralExpression", "isMany": true, "xml": { "serialize": "property" } }
+        { "name": "inputExpression", "type": "LiteralExpression", "xml": { "serialize": "property" } },
+        { "name": "inputValues", "type": "UnaryTests", "xml": { "serialize": "property" } }
       ]
     },
     {
+      "name": "OutputClause",
+      "superClass": [ "DMNElement" ],
+      "properties": [
+        { "name": "outputValues", "type": "UnaryTests", "xml": { "serialize": "property" } },
+        { "name": "defaultOutputEntry", "type": "LiteralExpression", "xml": { "serialize": "property" } },
+        { "name": "name", "type": "String", "isAttr": true },
+        { "name": "typeRef", "type": "String", "isAttr": true }
+      ]
+    },
+    {
+      "name": "UnaryTests",
+      "superClass": [ "DMNElement" ],
+      "properties": [
+        { "name": "text", "type": "String" },
+        { "name": "expressionLanguage", "type": "String", "isAttr": true }
+      ]
+    },
+    {
       "name": "DecisionRule",
       "superClass": [ "DMNElement" ],
       "properties": [
-        { "name": "condition", "type": "Expression", "isReference": true, "isMany": true },
-        { "name": "conclusion", "type": "Expression", "isReference": true, "isMany": true }
+        { "name": "inputEntry", "type": "UnaryTests", "isMany": true, "xml": { "serialize": "property" } },
+        { "name": "outputEntry", "type": "LiteralExpression", "isMany": true, "xml": { "serialize": "property" } }
       ]
@@ -111,0 +131,0 @@ }

test/spec/dmn-moddle.js

@@ -34,5 +34,5 @@ 'use strict';
     it('should create Definitions', function() {
-      var definitions = moddle.create('dmn:Definitions');
+      var definitions = moddle.create('dmn:definitions');
 
-      expect(definitions.$type).to.eql('dmn:Definitions');
+      expect(definitions.$type).to.eql('dmn:definitions');
     });
@@ -39,0 +39,0 @@

test/spec/xml/edit.js

@@ -18,5 +18,5 @@ 'use strict';
       // given
-      var fileContents = Helper.readFile('test/fixtures/dmn/item-definition.part.dmn');
+      var fileContents = Helper.readFile('test/fixtures/dmn/decision.part.dmn');
 
-      moddle.fromXML(fileContents, 'dmn:ItemDefinition', function(err, result) {
+      moddle.fromXML(fileContents, 'dmn:definitions', function(err, result) {
         if (err) {
@@ -23,0 +23,0 @@ return done(err);

test/spec/xml/read.js

@@ -20,22 +20,20 @@ 'use strict';
 
-  describe('should import types', function() {
+  describe('should import Decisions', function() {
 
     describe('dmn', function() {
 
-      it('ItemDefinition', function(done) {
+      it('Decision', function(done) {
 
-        // given
-
         // when
-        fromFile('test/fixtures/dmn/item-definition.part.dmn', 'dmn:ItemDefinition', function(err, result) {
+        fromFile('test/fixtures/dmn/decision.part.dmn', 'dmn:definitions', function(err, result) {
 
           var expected = {
-            $type: 'dmn:ItemDefinition',
-            id: 'item2',
-            name: 'OrderSumType',
-            typeDefinition: 'number'
+            $type: 'dmn:Decision',
+            id: 'decision',
+            name: 'decision-name'
           };
 
           // then
-          expect(result).to.jsonEqual(expected);
+          expect(err).to.be.undefined;
+          expect(result.decision[0]).to.jsonEqual(expected);
 
@@ -42,0 +40,0 @@ done(err);

test/spec/xml/roundtrip.js

@@ -21,3 +21,6 @@ 'use strict';
 
-    it('example decision', function(done) {
+    /*
+     * TODO: Try to teach moddle-xml not to forget empty text elements
+     */
+    it.skip('example decision', function(done) {
 
@@ -24,0 +27,0 @@ // given

test/spec/xml/write.js

@@ -36,6 +36,6 @@ 'use strict';
         // given
-        var definitions = moddle.create('dmn:Definitions');
+        var definitions = moddle.create('dmn:definitions');
 
         var expectedXML =
-          '<dmn:Definitions xmlns:dmn="http://www.omg.org/spec/DMN/20130901" />';
+          '<dmn:definitions xmlns:dmn="http://www.omg.org/spec/DMN/20130901" />';
 
@@ -42,0 +42,0 @@ // when

test/xml-helper.js

@@ -13,3 +13,3 @@ 'use strict';
 
-  moddle.fromXML(fileContents, 'dmn:Definitions', done);
+  moddle.fromXML(fileContents, 'dmn:definitions', done);
 };
@@ -16,0 +16,0 @@

No alert changes

Improved metrics

Total package byte prevSize

65502

increased by12.69%

Lines of code

569

increased by4.02%

No dependency changes