Do not nullify payload during errors

Author: Alkarex

examples/Cesva-TA120-to-NoiseLevelObserved.jsonata.js

@@ -0,0 +1,16 @@
+/**
+ * JSONata for converting from NGSI Normalised format to Simplified representation with key-value pairs.
+ *
+ * @author Alexandre Alapetite <https://alexandra.dk/alexandre.alapetite>
+ * @copyright Alexandra Institute <https://alexandra.dk> for the SynchroniCity European project <https://synchronicity-iot.eu> as a contribution to FIWARE <https://www.fiware.org>.
+ * @license MIT
+ * @date 2019-12-17 / 2019-12-17
+ */
+{
+	"id": NoiseLevelObserved.id,
+	"type": NoiseLevelObserved.type,
+	"LAeq": NoiseLevelObserved.LAeq,
+	"dateObservedFrom": NoiseLevelObserved.dateObserved,
+	"dateObservedTo": NoiseLevelObserved.dateObserved,
+	"location": NoiseLevelObserved.location
+}

json-multi-schema-resolver.js

@@ -54,7 +54,6 @@ module.exports = RED => {
 				if (schemaUrl != '') {
 					msg.schemaUrl = schemaUrl;
 				} else {
-					msg.payload = null;
 					msg.error = util.format('Failed resolving schema using "%s"', mappingsUrl);
 				}
 				if (lastStatusError) {
@@ -64,7 +63,6 @@ module.exports = RED => {
 			} catch (ex) {
 				lastStatusError = true;
 				node.status({ fill:'red', shape:'ring', text:'Error', });
-				msg.payload = null;
 				msg.error = util.format('Error resolving schema using "%s": %s', mappingsUrl, ex);
 			}
 			node.send(msg);

json-multi-schema-transformer.js

@@ -98,24 +98,19 @@ module.exports = RED => {
 					if (result) {
 						msg.payload = result;
 					} else {
-						msg.payload = null;
+						lastStatusError = true;
+						node.status({ fill:'red', shape:'ring', text:'Error', });
 						msg.error = util.format('Failed tranforming using "%s"', transformsUrl);
 					}
 					if (lastStatusError) {
 						node.status({ fill:'green', shape:'dot', text:'OK', });
 						lastStatusError = false;
 					}
-				} else {
-					lastStatusError = true;
-					node.status({ fill:'red', shape:'ring', text:'Error', });
-					msg.payload = null;
-					msg.error = util.format('Failed resolving tranforms using "%s"', transformsUrl);
 				}
 			} catch (ex) {
 				lastStatusError = true;
 				node.status({ fill:'red', shape:'ring', text:'Error', });
-				msg.payload = null;
-				msg.error = util.format('Error tranforming using "%s": %s', transformsUrl, ex);
+				msg.error = util.format('Error tranforming using "%s": %s : %s', transformsUrl, ex, JSON.stringify(msg.payload));
 			}
 			node.send(msg);
 		});

json-multi-schema-validator.js

@@ -86,23 +86,25 @@ module.exports = RED => {
 
 		node.on('input', async msg => {
 			delete msg.error;
-			try {
-				const result = await validateAsync(msg.schemaUrl, msg.payload);
-				if (result === true) {
-					msg.error = false;
-				} else {
-					msg.payload = null;
-					msg.error = util.format('Failed validatation against "%s": %s', msg.schemaUrl, result);
-				}
-				if (lastStatusError) {
-					node.status({ fill:'green', shape:'dot', text:'OK', });
-					lastStatusError = false;
+			if (msg.schemaUrl == '') {
+				msg.error = 'Unknown schema!';
+			} else {
+				try {
+					const result = await validateAsync(msg.schemaUrl, msg.payload);
+					if (result === true) {
+						msg.error = false;
+					} else {
+						msg.error = util.format('Failed validatation against "%s": %s', msg.schemaUrl, result);
+					}
+					if (lastStatusError) {
+						node.status({ fill:'green', shape:'dot', text:'OK', });
+						lastStatusError = false;
+					}
+				} catch (ex) {
+					lastStatusError = true;
+					node.status({ fill:'red', shape:'ring', text:'Error', });
+					msg.error = util.format('Failed validatation against "%s": %s', msg.schemaUrl, ex);
 				}
-			} catch (ex) {
-				lastStatusError = true;
-				node.status({ fill:'red', shape:'ring', text:'Error', });
-				msg.payload = null;
-				msg.error = util.format('Failed validatation against "%s": %s', msg.schemaUrl, ex);
 			}
 			node.send(msg);
 		});

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-json-multi-schema",
-	"version": "0.3.5",
+	"version": "0.4.0",
 	"description": "Generic JSON data pipeline tools, with dynamic transformation (using JSONata rules), resolving JSON Schema (using JSONata rules), and then validation (using JSON Schema). For Node-RED and for command-line.",
 	"main": "index.js",
 	"readmeFilename": "readme.md",