node-red-contrib-prib-functions 0.20.4 → 0.21.0

package/test/data/package-lock.json

@@ -14,7 +14,7 @@
             }
         },
         "../..": {
-            "version": "0.20.4",
+            "version": "0.21.0",
             "license": "GPL-3.0",
             "dependencies": {
                 "avsc": ">=5.7.7",

package/test/dataAnalysisExtensions.js

@@ -1,5 +1,4 @@
 const assert=require('assert');
-const should=require("should");
 const m2x2=[[11,12],[21,22]]
 const m2x3=[[11,12,13],[21,22,23]]
 

package/test/transformConfluence.js

@@ -1,4 +1,4 @@
-const should = require("should");
+//const should = require("should");
 const helper = require("node-red-node-test-helper");
 const transformNode = require("../transform/transform.js");
 const Buffer=require('buffer').Buffer;

package/testing/test.html

@@ -153,7 +153,7 @@
 			this.payloadType=setType(this.payloadType);
 			this.resultType=setType(this.resultType);
 			function setInput(t) {
-				let types=['flow','global','str','num','bool','json','bin','date','env'];
+				let types=['flow','global','str','num','bool','json','jsonata','bin','date','env'];
 				if(t=="result") types.push('re');
 				$("#node-input-"+t+"Type").val(this[t+"Type"]);
 				$("#node-input-"+t).typedInput({

package/testing/test.js

@@ -29,25 +29,35 @@ function setError(msg,node,err) {
 	node.send([null,msg]);
 }
 
-function equalObjects(obj1,obj2,errorFactor) {
-	if( obj1 === obj2 ) return true;
+function equalObjects(obj1,obj2,errorFactor,callEquals=()=>true,callNotEquals=()=>false) {
+	if( obj1 === obj2 ) return callEquals();
 	if(obj1 instanceof Buffer ) return Buffer.compare(obj1, obj2) === 0
-	if( obj1 === Number.POSITIVE_INFINITY && obj2==="Infinity") return true;
-	if( obj1 === Number.NEGATIVE_INFINITY && obj2==="-Infinity") return true;
-	if( Number.isNaN(obj1) && obj2==="NaN") return true;
+	if( obj1 === Number.POSITIVE_INFINITY && obj2==="Infinity") return callEquals();
+	if( obj1 === Number.NEGATIVE_INFINITY && obj2==="-Infinity") return callEquals();
+	if( Number.isNaN(obj1) && obj2==="NaN") return callEquals();
 	const obj1type=typeof obj1;
-	if(  obj1type != typeof obj2 ) return false;
+	if(  obj1type != typeof obj2 ) return callNotEquals();
 	if(errorFactor &&  obj1type=="number") return (Math.abs(obj2-obj1)/obj2)<errorFactor; 
-	if( !(obj1 instanceof Object) ) return false; 
-	if( Object.keys(obj1).length !== Object.keys(obj2).length ) return false;
+	if( !(obj1 instanceof Object) ) return callNotEquals(); 
+	if( Object.keys(obj1).length !== Object.keys(obj2).length ) return callNotEquals();
 	try{
 		for(let key in obj1) {
-			if( !equalObjects(obj1[key],obj2[key],errorFactor) ) return false;
+			if( !equalObjects(obj1[key],obj2[key],errorFactor) ) return callNotEquals();
 		}
 	} catch(e) {
-		return false;
+		return callNotEquals();
 	}
-	return true;
+	return callEquals();
+}
+
+const testedOK=(node,msg)=>{
+	node.status({fill:"green",shape:"ring",text:"Success"});
+	delete msg._test;
+	node.send([null,null,msg]);
+}
+const testedFailed=(node,msg)=>{
+	msg._test.testedValue=node.getData(msg,node);
+	setError(msg,node,"Test failed");
 }
 
 module.exports = function(RED) {
@@ -56,9 +66,17 @@ module.exports = function(RED) {
 		RED.nodes.createNode(this,n);
 		let node=Object.assign(this,n);
 		try{
-			node.getData=eval("((msg,node)=>"+(node.resultProperty||"msg.payload")+")");
+			node.isJSONata=node.resultType=="jsonata"
 			if(node.escapeString && node.resultType=="str") {
 				node.getData=eval("((msg,node)=>escapeSpecialChars("+(node.resultProperty||"msg.payload")+"))");
+			} else{
+				if(node.isJSONata) {
+					if(!node.result.startsWith("$boolean"))
+						throw Error("JSONata must have $boolean outcome, found: "+node.resultProperty.substr(0,8))
+					node.resultExpression=RED.util.prepareJSONataExpression(node.result, node)
+					node.resultExpression.assign('node', node); 
+				}
+				node.getData=eval("((msg,node)=>"+(node.resultProperty||"msg.payload")+")");
 			}
 			node.status({fill:"green",shape:"ring",text:"Ready"});
 		} catch(e) {
@@ -66,59 +84,66 @@ module.exports = function(RED) {
 			node.status({fill:"red",shape:"ring",text:"Invalid setup "+e.toString()});
 		}
 		node.payloadEscape=(node.payloadType=="str"&&node.escapeString);
-		node.equalObjects=node.resultType=="re"?(value,regex)=>RegExp(regex).test(value):equalObjects;
+		node.equalObjects=node.resultType=="re"?
+			(value,regex,callEquals,callNotEquals)=>(RegExp(regex).test(value)?callEquals():callNotEquals()):
+			(obj1,obj2,errorFactor,callEquals,callNotEquals)=>equalObjects(obj1,obj2,errorFactor,callEquals,callNotEquals);
 		node.on("input",function(msg) {
 			if(msg._test) {
 				try{
-					if(msg._test.id!==node.id) {
-						setError(msg,node,"Sent by another test "+msg._test.id);
-					} else if(!equalObjects(node.getData(msg,node),msg._test.result,node.errorFactor)) {
-						msg._test.testedValue=node.getData(msg,node);
-						setError(msg,node,"Test failed");
-					} else {
-						node.status({fill:"green",shape:"ring",text:"Success"});
-						delete msg._test;
-						node.send([null,null,msg]);
-					}
+					if(msg._test.id!==node.id) return setError(msg,node,"Sent by another test "+msg._test.id);
+
+					if(node.isJSONata) 
+						return 	RED.util.evaluateJSONataExpression(node.resultExpression,msg,(err,data)=>{
+							if(err) testedFailed(node,msg)
+							else return data?testedOK(node,msg):testedFailed(node,msg)
+						})
+					
+					node.equalObjects(node.getData(msg,node),msg._test.result,node.errorFactor,
+						()=>testedOK(node,msg),
+						()=>testedFailed(node,msg)
+					);
+
 				} catch(ex){
 					setError(msg,node,"Test failed on get data "+ex.message);
 				}
 				return;
 			}
 			node.status({fill:"yellow",shape:"ring",text:"waiting on response"});
-			const result=RED.util.evaluateNodeProperty(node.result,node.resultType,node,msg);
-			msg._test={
-				id:node.id,
-				result:node.escapeString&&node.resultType=="str"?escapeSpecialChars(result):result
-			};
-			msg.topic=node.topic;
-			if(["flow","global"].includes(node.payloadType)) {
-				RED.util.evaluateNodeProperty(node.payload,node.payloadType,node,msg, function(err,res) {
-					if (err) {
-						node.error(err,msg);
-					} else {
-						msg.payload=res;
+			let result=RED.util.evaluateNodeProperty(node.result,node.resultType,node,msg,(err,data)=>{
+				if(err) node.error(err,msg)
+				msg._test={
+					id:node.id,
+					result:node.escapeString&&node.resultType=="str"?escapeSpecialChars(data):data
+				};
+				msg.topic=node.topic;
+				if(["flow","global"].includes(node.payloadType)) {
+					RED.util.evaluateNodeProperty(node.payload,node.payloadType,node,msg, (err,res)=>{
+						if (err) {
+							node.error(err,msg);
+						} else {
+							msg.payload=res;
+							node.send(msg);
+						}
+					});
+				} else {
+					try {
+						if ( (node.payloadType == null && node.payload === "") || node.payloadType === "date") {
+							msg.payload = Date.now();
+						} else if (node.payloadType == null) {
+							msg.payload = node.payload;
+						} else if (node.payloadType === 'none') {
+							msg.payload = "";
+						} else {
+							msg.payload=RED.util.evaluateNodeProperty(this.payload,node.payloadType,node,msg);
+							if(node.payloadEscape) msg.payload=msg.payload.escapeSpecialChars();
+						}
 						node.send(msg);
+						msg = null;
+					} catch(err) {
+						node.error(err,msg);
 					}
-				});
-			} else {
-				try {
-					if ( (node.payloadType == null && node.payload === "") || node.payloadType === "date") {
-						msg.payload = Date.now();
-					} else if (node.payloadType == null) {
-						msg.payload = node.payload;
-					} else if (node.payloadType === 'none') {
-						msg.payload = "";
-					} else {
-						msg.payload=RED.util.evaluateNodeProperty(this.payload,node.payloadType,node,msg);
-						if(node.payloadEscape) msg.payload=msg.payload.escapeSpecialChars();
-					}
-					node.send(msg);
-					msg = null;
-				} catch(err) {
-					node.error(err,msg);
 				}
-			}
+			});
 		});
 	}
 

package/arima/index.js

@@ -1,18 +0,0 @@
-const observations=[]
-
-        
-
-if(Array.prototype.differenceSeasonalSecondOrder ==null)
-    Object.defineProperty(Array.prototype, "differenceSeasonalSecondOrder", {
-        value(lag) {
-            let i=result.length-lag-1
-            const result=new Array(size)
-            while(i--) {
-                const ilag=i-lag
-                result[i]=this[i]-this[i+1]-this[iLag]+this[iLag+1]
-            }
-            return result;
-        },
-        writable: true,
-         configurable: true
-    });