clone msg for every single line output

(this may not be desired)
Add tests to ensure properties go trhough

Gruntfile.js

@@ -16,6 +16,7 @@
 
 var path = require("path");
 var fs = require("fs-extra");
+var sass = require("node-sass");
 
 module.exports = function(grunt) {
 
@@ -220,6 +221,7 @@ module.exports = function(grunt) {
         sass: {
             build: {
                 options: {
+                    implementation: sass,
                     outputStyle: 'compressed'
                 },
                 files: [{

package.json

@@ -93,19 +93,20 @@
         "grunt-mocha-istanbul": "5.0.2",
         "grunt-nodemon": "~0.4.2",
         "grunt-npm-command": "~0.1.2",
-        "grunt-sass": "~2.0.0",
+        "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
         "http-proxy": "^1.16.2",
         "istanbul": "0.4.5",
+        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
         "mosca": "^2.8.3",
+        "node-red-node-test-helper": "^0.2.3",
+        "node-sass": "^4.13.0",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",
-        "supertest": "3.4.2",
+        "supertest": "3.4.2"
-        "node-red-node-test-helper": "^0.2.3",
-        "jsdoc-nr-template": "node-red/jsdoc-nr-template"
     },
     "engines": {
         "node": ">=8"

packages/node_modules/@node-red/nodes/core/storage/10-file.js

@@ -140,8 +140,8 @@ module.exports = function(RED) {
                             try {
                                 var stat = fs.statSync(filename);
                                 node.wstreamIno = stat.ino;
-                            } catch(err) {
+                            } 
-                            }
+                            catch(err) { }
                         });
                         node.wstream.on("error", function(err) {
                             node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
@@ -276,7 +276,6 @@ module.exports = function(RED) {
                     ch = "\n";
                     type = "string";
                 }
-                var hwm;
                 var getout = false;
 
                 var rs = fs.createReadStream(filename)
@@ -290,30 +289,24 @@ module.exports = function(RED) {
                                     spare += decode(chunk, node.encoding);
                                     var bits = spare.split("\n");
                                     for (var i=0; i < bits.length - 1; i++) {
-                                        var m = {
+                                        var sendMessage = RED.util.cloneMessage(msg);
-                                            payload:bits[i],
+                                        sendMessage.payload = bits[i];
-                                            topic:msg.topic,
+                                        sendMessage.parts = {index:count, ch:ch, type:type, id:msg._msgid};
-                                            filename:msg.filename,
-                                            parts:{index:count, ch:ch, type:type, id:msg._msgid}
-                                        }
                                         count += 1;
-                                        nodeSend(m);
+                                        nodeSend(sendMessage);
                                     }
                                     spare = bits[i];
                                 }
                                 if (node.format === "stream") {
-                                    var m = {
+                                    var sendMessage = RED.util.cloneMessage(msg);
-                                        payload:chunk,
+                                    sendMessage.payload = chunk;
-                                        topic:msg.topic,
+                                    sendMessage.parts = {index:count, ch:ch, type:type, id:msg._msgid};
-                                        filename:msg.filename,
-                                        parts:{index:count, ch:ch, type:type, id:msg._msgid}
-                                    }
                                     count += 1;
                                     if (chunk.length < hwm) { // last chunk is smaller that high water mark = eof
                                         getout = false;
-                                        m.parts.count = count;
+                                        sendMessage.parts.count = count;
                                     }
-                                    nodeSend(m);
+                                    nodeSend(sendMessage);
                                 }
                             }
                             else {
@@ -332,28 +325,23 @@ module.exports = function(RED) {
                         nodeDone();
                     })
                     .on('end', function() {
+                        var sendMessage = RED.util.cloneMessage(msg);
                         if (node.chunk === false) {
                             if (node.format === "utf8") {
-                                msg.payload = decode(lines, node.encoding);
+                                sendMessage.payload = decode(lines, node.encoding);
                             }
-                            else { msg.payload = lines; }
+                            else { sendMessage.payload = lines; }
-                            nodeSend(msg);
+                            nodeSend(sendMessage);
                         }
                         else if (node.format === "lines") {
-                            var m = { payload: spare,
+                            sendMessage.payload = spare;
-                                      parts: {
+                            sendMessage.parts = { index:count, count:count+1, ch:ch, type:type, id:msg._msgid };
-                                          index: count,
+                            nodeSend(sendMessage);
-                                          count: count+1,
-                                          ch: ch,
-                                          type: type,
-                                          id: msg._msgid
-                                      }
-                                    };
-                            nodeSend(m);
                         }
                         else if (getout) { // last chunk same size as high water mark - have to send empty extra packet.
-                            var m = { parts:{index:count, count:count, ch:ch, type:type, id:msg._msgid} };
+                            delete sendMessage.payload;
-                            nodeSend(m);
+                            sendMessage.parts = { parts:{index:count, count:count, ch:ch, type:type, id:msg._msgid} };
+                            nodeSend(sendMessage);
                         }
                         nodeDone();
                     });

test/nodes/core/storage/10-file_spec.js

@@ -1192,6 +1192,43 @@ describe('file Nodes', function() {
             });
         });
 
+        it('should read in a file and output split lines with parts and preserve other properties', function(done) {
+            var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"lines", wires:[["n2"]]},
+                        {id:"n2", type:"helper"}];
+            helper.load(fileNode, flow, function() {
+                var n1 = helper.getNode("fileInNode1");
+                var n2 = helper.getNode("n2");
+                var c = 0;
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload');
+                        msg.payload.should.be.a.String();
+                        msg.should.have.property('topic',"dujour");
+                        msg.should.have.property('foo',"bar");
+                        msg.should.have.property('parts');
+                        msg.parts.should.have.property('index',c);
+                        msg.parts.should.have.property('type','string');
+                        msg.parts.should.have.property('ch','\n');
+                        if (c === 0) {
+                            msg.payload.should.equal("File message line 1");
+                        }
+                        if (c === 1) {
+                            msg.payload.should.equal("File message line 2");
+                        }
+                        if (c === 2) {
+                            msg.payload.should.equal("");
+                            done();
+                        }
+                        c++;
+                    }
+                    catch(e) {
+                        done(e);
+                    }
+                });
+                n1.receive({payload:"",topic:"dujour",foo:"bar"});
+            });
+        });
+
         it('should read in a file and output a buffer with parts', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"stream", wires:[["n2"]]},
                         {id:"n2", type:"helper"}];
@@ -1212,6 +1249,28 @@ describe('file Nodes', function() {
             });
         });
 
+        it('should read in a file and output a buffer with parts and preserve other properties', function(done) {
+            var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"stream", wires:[["n2"]]},
+                        {id:"n2", type:"helper"}];
+            helper.load(fileNode, flow, function() {
+                var n1 = helper.getNode("fileInNode1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    msg.should.have.property('payload');
+                    msg.should.have.property('topic',"dujour");
+                    msg.should.have.property('foo',"bar");
+                    Buffer.isBuffer(msg.payload).should.be.true();
+                    msg.payload.should.have.length(40);
+                    msg.should.have.property('parts');
+                    msg.parts.should.have.property('count',1);
+                    msg.parts.should.have.property('type','buffer');
+                    msg.parts.should.have.property('ch','');
+                    done();
+                });
+                n1.receive({payload:"",topic:"dujour",foo:"bar"});
+            });
+        });
+
         it('should warn if no filename set', function(done) {
             var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", "format":""}];
             helper.load(fileNode, flow, function() {