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

package/transform/transform.html

@@ -57,6 +57,8 @@
 				{ value: "CSV", label: "CSV"},
 				{ value: "ISO8385", label: "ISO 8583"},
 				{ value: "JSON", label: "JSON"},
+				{ value: "npy", label: "npy"},
+				{ value: "NumPyObject", label: "NumPy Obect"},
 				{ value: "String", label: "String"},
 				{ value: "snappy", label: "Snappy"},
 				{ value: "path", label: "Path"},
@@ -137,11 +139,21 @@
 					options["HTML"]="HTML";
 					options["JSON"]="JSON";
 					options["Messages"]="Messages";
+					options["npy"]="npy";
+					options["NumPyObject"]="NumPy Object";
 					options["String"]="String";
 					options["XLSX"]="XLSX";
 					options["XLSXObject"]="XLSX Object";
 					options["XML"]="XML";
 					break;
+				case 'npy':
+					options["JSON"]="JSON";
+					options["NumPyObject"]="NumPy Object";
+					break;
+				case 'NumPyObject':
+					options["JSON"]="JSON";
+					break;
+				
 				case 'path':
 					options["Basename"]="basename";
 					options["Dirname"]="dirname";

package/transform/transform.js

@@ -1,7 +1,7 @@
 const logger = new (require("node-red-contrib-logger"))("transform");
 logger.sendInfo("Copyright 2020 Jaroslav Peter Prib");
 const CompressionTool = require('compressiontool');
-
+const NumPy = require("./NumPy.js")
 const regexCSV=/,(?=(?:(?:[^"]*"){2})*[^"]*$)/,
 	Buffer=require('buffer').Buffer,
 	os=require('os'),
@@ -332,6 +332,7 @@ const functions={
 		}
 		return data;
 	},
+	JSONToAVRO: (RED,node,msg,data)=>node.avroTransformer.toBuffer(data), // Encoded buffer.
 	JSONToCompressed: (RED,node,msg,data)=>compressor.compress(JSON.stringify(data),
 		(compressed)=>{
 			node.setData(RED,node,msg,compressed);
@@ -343,7 +344,6 @@ const functions={
 	),
 	JSONToConfluence:JSONToConfluence,
 	JSONToCSV: (RED,node,msg,data)=>Array2csv(node,data),
-	JSONToAVRO: (RED,node,msg,data)=>node.avroTransformer.toBuffer(data), // Encoded buffer.
 	JSONToHTML: (RED,node,msg,data,level=0)=>{
 		if(Array.isArray(data)) {
 			return data.length?"<table><tr>"+data.map((r)=>functions.JSONToHTML(RED,node,msg,r,++level)).join("</tr><tr>")+"</tr><table>":"";
@@ -375,10 +375,15 @@ const functions={
 			node.send(newMsg);
 		}
 	},
+	JSONTonpy: (RED,node,msg,data)=>new NumPy(data).toNpyBuffer(),
+	JSONToNumPyObject: (RED,node,msg,data)=>new NumPy(data),
 	JSONToString: (RED,node,msg,data)=>JSON.stringify(data),
 	JSONToXLSX:JSONToXLSX,
 	JSONToXLSXObject:JSONToXLSXObject,
 	JSONToXML: (RED,node,msg,data)=>json2xmlParser.parse(data),
+	npyToJSON: (RED,node,msg,data)=>new NumPy(data).toSerializable(),
+	npyToNumPyObject: (RED,node,msg,data)=>new NumPy(data),
+	NumPyObjectToJSON: (RED,node,msg,data)=> data.toSerializable(),
 	StringToCompressed: (RED,node,msg,data)=>compressor.compress(data,
 		(compressed)=>{
 			node.setData(RED,node,msg,compressed);
@@ -441,6 +446,23 @@ function evalFunction(id,mapping){
 function is(node,value){
 	return node.actionSource==value||node.actionTarget==value;
 }
+let jsonata;
+function JSONataTransform(data,ok,error){
+/*
+(async () => {
+    return result = await expression.evaluate(data);
+})()
+*/
+
+	this.transformFuncionCompiled.evalFunction(data,{},(error, result) => {
+		if(error) {
+		  console.error(error);
+		  return;
+		}
+		console.log("Finished with", result);
+	});
+}
+
 module.exports = function (RED) {
 	function transformNode(n) {
 		RED.nodes.createNode(this,n);
@@ -513,6 +535,16 @@ module.exports = function (RED) {
 				}
 			}
 		}
+		if(node.transformFuncion && ( node.actionSource=="JSON" || node.actionTarget=="JSON" )) {
+			try{
+				if(!jsonata) jsonata=require('jsonata')
+				node.transformFuncionCompiled = jsonata(node.transformFuncion);
+			} catch (ex) {
+				error(node,ex,"Transform function error");
+				return;
+			}
+		}
+
 		const typeValidate="invalid"+node.actionSource;
 		node.invalidSourceType=typeValidate in functions &! ["XLSX","XLSXObject"].includes(node.actionTarget)?functions[typeValidate]:(()=>false);
 		try {