@balena/sbvr-parser 1.2.5 → 1.3.0

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,20 @@
+- commits:
+    - subject: Add support for more forms of negation in rules
+      hash: 6d6e3690668b6b64deefcde68f3ebe5f731577ce
+      body: ''
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Pagan Gazzard
+    - subject: Do not check for negated verbs when declaring fact types
+      hash: e1fd4b0245993e0704a866f783dfc9bd98743ebb
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+  version: 1.3.0
+  date: 2021-12-16T17:05:11.285Z
 - commits:
     - subject: Delete CODEOWNERS
       hash: d26be5bb58b10118fc49c04509ce4e0b0746e962
@@ -11,7 +28,7 @@
           https://www.flowdock.com/app/rulemotion/pub/threads/trLcZFnSX9fLZn4LiaIv4xuBbah
       author: Thodoris Greasidis
   version: 1.2.5
-  date: 2021-06-30T21:28:08.336Z
+  date: 2021-06-30T21:23:54.448Z
 - commits:
     - subject: Optimize space matching
       hash: 59e1232f8da68f98c65739d5c80de11d3f613b55

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v1.3.0
+## (2021-12-16)
+
+* Add support for more forms of negation in rules [Pagan Gazzard]
+* Do not check for negated verbs when declaring fact types [Pagan Gazzard]
+
 # v1.2.5
 ## (2021-06-30)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/sbvr-parser",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "SBVR to LF parser.",
   "main": "sbvr-parser.js",
   "scripts": {
@@ -20,10 +20,10 @@
     "ometa-js": "^1.5.4"
   },
   "devDependencies": {
-    "@balena/lint": "^6.1.1",
-    "@balena/sbvr-types": "^3.4.3",
+    "@balena/lint": "^6.2.0",
+    "@balena/sbvr-types": "^3.4.6",
     "chai": "^4.3.4",
-    "mocha": "^8.4.0",
+    "mocha": "^9.1.3",
     "require-npm4-to-publish": "^1.0.0"
   },
   "mocha": {
@@ -32,5 +32,8 @@
     "bail": true,
     "timeout": 5000,
     "_": "test"
+  },
+  "versionist": {
+    "publishedAt": "2021-12-16T17:05:11.351Z"
   }
 }

package/sbvr-parser.js

@@ -6,7 +6,9 @@ var isEOL = function isEOL(x) {
     return [ "\n", "\r" ].includes(x);
 }, isSpace = function isSpace(x) {
     return x.charCodeAt(0) <= 32;
-}, SBVRParser = exports.SBVRParser = SBVRLibs._extend({
+}, negatableVerbs = [ "is", "are", "has", "have", "can", "could", "may", "might", "must", "should", "shall", "will" ], negatedVerbs = negatableVerbs.map(function(verb) {
+    return "will" === verb ? "won't" : verb + "n't";
+}), SBVRParser = exports.SBVRParser = SBVRLibs._extend({
     EOL: function() {
         var $elf = this, _fromIdx = this.input.idx, x;
         return this._many1(function() {
@@ -376,15 +378,17 @@ var isEOL = function isEOL(x) {
         return verb;
     },
     FindVerb: function(factTypeSoFar, bracketed, verbSoFar, negated) {
-        var $elf = this, _fromIdx = this.input.idx, negated, part, verb, verbSoFar;
+        var $elf = this, _fromIdx = this.input.idx, index, negated, part, verb, verbSoFar;
         this._opt(function() {
-            this._pred(factTypeSoFar && !verbSoFar);
+            this._pred(!0 !== factTypeSoFar && !verbSoFar);
             this._or(function() {
-                return this._applyWithArgs("Keyword", "isn't");
+                return this._applyWithArgs("Keyword", "does not");
             }, function() {
-                return this._applyWithArgs("Keyword", "aren't");
+                return this._applyWithArgs("Keyword", "doesn't");
+            }, function() {
+                index = this._applyWithArgs("matchForAny", "Keyword", negatedVerbs, !0);
+                return verbSoFar = this._verbForm(negatableVerbs[index]);
             });
-            verbSoFar = "is";
             return negated = !0;
         });
         this._apply("spaces");
@@ -403,7 +407,7 @@ var isEOL = function isEOL(x) {
             return this._verbForm(part);
         });
         this._opt(function() {
-            this._pred(factTypeSoFar && "is" === verbSoFar);
+            this._pred(!0 !== factTypeSoFar && negatableVerbs.includes(verbSoFar));
             this._apply("spaces");
             this._applyWithArgs("Keyword", "not");
             return negated = !0;
@@ -1287,7 +1291,7 @@ SBVRParser.AddCustomAttribute = function(attributeName, attachedTo) {
     }
 };
 
-SBVRParser.matchForAny = function(rule, arr) {
+SBVRParser.matchForAny = function(rule, arr, returnIndex) {
     for (var $elf = this, origInput = this.input, ref = {}, result = ref, idx = 0; idx < arr.length; idx++) {
         try {
             $elf.input = origInput;
@@ -1295,7 +1299,7 @@ SBVRParser.matchForAny = function(rule, arr) {
         } catch (e) {
             if (!(e instanceof SyntaxError)) throw e;
         }
-        if (result !== ref) return result;
+        if (result !== ref) return returnIndex ? idx : result;
     }
     throw this._fail();
 };

package/sbvr-parser.ometajs

@@ -13,6 +13,14 @@ function isSpace(x) {
 	return x.charCodeAt(0) <= 32;
 }
 
+var negatableVerbs = ['is', 'are', 'has', 'have', 'can', 'could', 'may', 'might', 'must', 'should', 'shall', 'will'];
+var negatedVerbs = negatableVerbs.map(function (verb) {
+	if (verb === 'will') {
+		return "won't";
+	}
+	return verb + "n't"
+})
+
 export ometa SBVRParser <: SBVRLibs {
 	EOL =
 		(	anything:x
@@ -219,11 +227,13 @@ export ometa SBVRParser <: SBVRLibs {
 		)
 		-> verb,
 	FindVerb :factTypeSoFar :bracketed :verbSoFar :negated =
-		(	?(factTypeSoFar && !verbSoFar)
-			(	Keyword("isn't")
-			|	Keyword("aren't")
+		(	?(factTypeSoFar !== true && !verbSoFar)
+			(	Keyword('does not')
+			|	Keyword('doesn\'t')
+			|	matchForAny('Keyword', negatedVerbs, true):index
+				// Use the non-negated form for the verb
+				{this._verbForm(negatableVerbs[index])}:verbSoFar
 			)
-			{'is'}:verbSoFar
 			{true}:negated
 		)?
 
@@ -239,13 +249,13 @@ export ometa SBVRParser <: SBVRLibs {
 			-> (verbSoFar + ' ' + part)
 		|	-> this._verbForm(part)
 		):verbSoFar
-		(	?(factTypeSoFar && verbSoFar === 'is')
+		(	?(factTypeSoFar !== true && negatableVerbs.includes(verbSoFar))
 			spaces
 			Keyword('not')
 			{true}:negated
 		)?
 		(	FindVerb(factTypeSoFar, bracketed, verbSoFar, negated)
-		|	(	?(factTypeSoFar===true)
+		|	(	?(factTypeSoFar === true)
 			|	IsVerb(factTypeSoFar, verbSoFar)
 			)
 			{['Verb', verbSoFar, negated === true]}:verb
@@ -1061,7 +1071,7 @@ SBVRParser.AddCustomAttribute = function(attributeName, attachedTo) {
 };
 
 /** **/
-SBVRParser.matchForAny = function(rule, arr) {
+SBVRParser.matchForAny = function(rule, arr, returnIndex) {
 	var self = this,
 	origInput = this.input,
 	ref = {},
@@ -1079,6 +1089,9 @@ SBVRParser.matchForAny = function(rule, arr) {
 		}
 
 		if (result !== ref) {
+			if (returnIndex) {
+				return idx;
+			}
 			return result;
 		}
 	}

package/test/pilots.js

@@ -315,6 +315,24 @@ describe('pilots', function () {
 			),
 		),
 	);
+
+	// Rule:       It is necessary that each pilot that is not experienced, can not fly at least 2 planes or does not have a years of experience that is greater than 5
+	test(
+		rule(
+			'Necessity',
+			'each',
+			[pilot, verb('is experienced', true)],
+			_or(
+				[verb('can fly', true), ['at least', 2], plane],
+				[
+					verb('has', true),
+					'a',
+					[yearsOfExperience, verb('is greater than'), 5],
+				],
+			),
+		),
+	);
+
 	// Rule:       It is necessary that each pilot that is experienced or can fly at least 2 planes, has a years of experience that is greater than 5
 	test(
 		rule(

package/test/sbvr-helper.js

@@ -101,7 +101,11 @@ const toSE = function (lf, currentVocab) {
 				}
 			case 'Verb':
 				if (lf[2]) {
-					return lf[1].replace('is', 'is not');
+					let verb = lf[1].replace('is', 'is not').replace('can', 'can not');
+					if (verb === lf[1]) {
+						return `does not ${verb}`;
+					}
+					return verb;
 				} else {
 					return lf[1];
 				}