diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ea3845c2..9d24243fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,59 @@ +#### 1.0.6: Maintenance Release + +Runtime + + - Update to JSONata 1.8.3 + - #2536 Handle clone of null in utils + +Editor + + - Prevent button label wrapping in typedInput + - Handle error objects when reporting in palette manager + +Nodes + + - Inject: Revert to cron 1.7.2 + - UDP: when reusing input socket honour the broadcast mode. + +#### 1.0.5: Maintenance Release + +Runtime + + - #2500 Support for context stores using JSONata and evaluateNodeProperty() + - Add better handling of host-key-verify error with projects + - #2517 Handle false values in $env() properly + - #2514 Ensure complete node scope is remapped in subflows + - #2513 Flows/subflows must preinitialise their context objects + - Clear node.close timeout to avoid unnecessary work on restart + - #2532 Set flow.disabled when disabled property is false + - #2522 Ensure file context does not write 'undefined' to store + +Editor + + - #2489 Fix XPath in UI tests + - #2504 Fix paletteCategories order + - #2501 Add page objects for UI testing + - #2494 Check node props when deciding if pasted node can splice links + - #2521 Don't double-sanitize node name in debug sidebar + - #2519 German i18n updates + - #2523 Update nodeTabMap when replacing unknown nodes + - Update TypedInput to use flexbox and remove resizing code + - Handle nodes with no wires array + - Do not collapse whitespace in Debug string messages + +Nodes + + - File: Remove old legacy wording from file node info to stop confusing users. + - Join: Ensure join node handles missing buffer joiner when not in string mode + - Exec: make exec node logging consistent with itself. (only be verbose when in verbose mode) + - Trigger: reset default timeout value when switching away from wait for reset + - Join: Fix join to not crash on appending invalid types to buffer. + - MQTT out: Add warning if topic contains + or # + - #2502 WebSocket i18n update + - #2508 Add Japanese translation for join node + - TCP out: tidy up select of which rows to display + + #### 1.0.4: Maintenance Release Runtime diff --git a/package.json b/package.json index 0ccf2767c..5bf4e5ee0 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ "clone": "2.1.2", "content-type": "1.0.4", "cookie": "0.4.0", - "cookie-parser": "1.4.4", + "cookie-parser": "1.4.5", "cors": "2.8.5", - "cron": "1.8.2", + "cron": "1.7.2", "denque": "1.4.1", "express": "4.17.1", "express-session": "1.17.0", @@ -47,18 +47,18 @@ "is-utf8": "0.2.1", "js-yaml": "3.13.1", "json-stringify-safe": "5.0.1", - "jsonata": "1.8.1", + "jsonata": "1.8.3", "lodash.clonedeep": "^4.5.0", "media-typer": "1.1.0", "memorystore": "1.6.2", "mime": "2.4.4", "mqtt": "2.18.8", "multer": "1.4.2", - "mustache": "4.0.0", + "mustache": "4.0.1", "node-red-node-rbe": "^0.2.6", "node-red-node-sentiment": "^0.1.6", "node-red-node-tail": "^0.1.0", - "nopt": "4.0.1", + "nopt": "4.0.3", "oauth2orize": "1.11.0", "on-headers": "1.0.2", "passport": "0.4.1", @@ -67,16 +67,16 @@ "raw-body": "2.4.1", "request": "2.88.0", "semver": "6.3.0", - "uglify-js": "3.8.0", + "uglify-js": "3.8.1", "when": "3.7.8", "ws": "6.2.1", "xml2js": "0.4.23" }, "optionalDependencies": { - "bcrypt": "3.0.6" + "bcrypt": "3.0.8" }, "devDependencies": { - "marked": "0.8.0", + "marked": "0.8.2", "dompurify": "2.0.8", "grunt": "~1.0.4", "grunt-chmod": "~1.1.1", diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json index 01d49bd96..936fe3edc 100644 --- a/packages/node_modules/@node-red/editor-api/package.json +++ b/packages/node_modules/@node-red/editor-api/package.json @@ -26,7 +26,7 @@ "express": "4.17.1", "memorystore": "1.6.2", "mime": "2.4.4", - "mustache": "4.0.0", + "mustache": "4.0.1", "oauth2orize": "1.11.0", "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index 587a23d5b..e6b4bccca 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -1224,7 +1224,7 @@ RED.nodes = (function() { defaults: {}, label: "unknown: "+n.type, labelStyle: "red-ui-flow-node-label-italic", - outputs: n.outputs||n.wires.length, + outputs: n.outputs|| (n.wires && n.wires.length) || 0, set: registry.getNodeSet("node-red/unknown") } } else { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js index 760f3c879..06b0dc81d 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js @@ -737,11 +737,13 @@ this.optionExpandButton.shown = false; } if (this.optionSelectTrigger) { - this.optionSelectTrigger.show(); + this.optionSelectTrigger.css({"display":"inline-flex"}); if (!opt.hasValue) { + this.optionSelectTrigger.css({"flex-grow":1}) this.elementDiv.hide(); this.valueLabelContainer.hide(); } else { + this.optionSelectTrigger.css({"flex-grow":0}) this.elementDiv.show(); this.valueLabelContainer.hide(); } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js index 97214ace9..f89d6ab9e 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js @@ -223,7 +223,11 @@ RED.palette.editor = (function() { var setElements = nodeEntry.sets[setName]; if (set.err) { errorCount++; - $("
  • ").text(set.err).appendTo(nodeEntry.errorList); + var errMessage = set.err; + if (set.err.message) { + errMessage = set.err.message; + } + $("
  • ").text(errMessage).appendTo(nodeEntry.errorList); } if (set.enabled) { activeTypeCount += set.types.length; diff --git a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss index c92c43320..1e77e46e1 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss @@ -217,6 +217,10 @@ .red-ui-debug-msg-type-number { color: $debug-message-text-color-msg-type-number; }; .red-ui-debug-msg-type-number-toggle { cursor: pointer;} +.red-ui-debug-msg-type-string { + white-space: pre-wrap; +} + .red-ui-debug-msg-row { display: block; padding: 4px 2px 2px; diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss index e5d80cd72..4614d83fa 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss @@ -760,7 +760,7 @@ button.red-ui-toggleButton.toggle { .red-ui-typedInput-value-label,.red-ui-typedInput-option-label { select,.placeholder-input { margin: 3px; - height: 26px; + height: 24px; width: calc(100% - 10px); padding-left: 3px; } diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss index 3516c3eda..ec865b116 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss @@ -110,9 +110,9 @@ button.red-ui-typedInput-option-trigger background: $form-button-background; height: 32px; line-height: 30px; - min-width: 23px; vertical-align: middle; color: $form-text-color; + white-space: nowrap; i.red-ui-typedInput-icon { margin-left: 1px; margin-right: 2px; @@ -174,25 +174,21 @@ button.red-ui-typedInput-option-trigger { padding: 0 0 0 0; position:relative; flex-grow: 1; + line-height: 32px; + display: inline-flex; .red-ui-typedInput-option-label { background:$form-button-background; color: $form-text-color; - position:absolute; - left:0; - right:23px; - top: 0; - padding: 0 5px 0 8px; - i.red-ui-typedInput-icon { - margin-right: 4px; - } + flex-grow: 1; + padding: 0 0 0 8px; + display:inline-block; } .red-ui-typedInput-option-caret { - top: 0; - position: absolute; - right: 0; - bottom: 0; - width: 17px; - padding-left: 5px; + flex-grow: 0; + display:inline-block; + width: 23px; + text-align: center; + height: 100%; &:before { content:''; display: inline-block; diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html index 77ced7d66..bd90b82e4 100644 --- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html @@ -16,14 +16,12 @@
    @@ -76,11 +81,6 @@ var replace = this._("change.action.replace"); var regex = this._("change.label.regex"); - function resizeRule(rule) { - var newWidth = rule.width(); - rule.find('.red-ui-typedInput').typedInput("width",newWidth-130); - - } $('#node-input-rule-container').css('min-height','150px').css('min-width','450px').editableList({ addItem: function(container,i,opt) { var rule = opt; @@ -106,10 +106,11 @@ overflow: 'hidden', whiteSpace: 'nowrap' }); - var row1 = $('
    ').appendTo(container); - var row2 = $('
    ',{style:"margin-top:8px;"}).appendTo(container); - var row3 = $('
    ',{style:"margin-top:8px;"}).appendTo(container); - var row4 = $('
    ',{style:"margin-top:8px;"}).appendTo(container); + let fragment = document.createDocumentFragment(); + var row1 = $('
    ',{style:"display:flex;"}).appendTo(fragment); + var row2 = $('
    ',{style:"display:flex;margin-top:8px;"}).appendTo(fragment); + var row3 = $('
    ',{style:"margin-top:8px;"}).appendTo(fragment); + var row4 = $('
    ',{style:"display:flex;margin-top:8px;"}).appendTo(fragment); var selectField = $('',{class:"node-input-rule-property-value",type:"text"}) + + function createPropertyValue() { + return $('',{class:"node-input-rule-property-value",type:"text"}) .appendTo(row2) .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']}); + } - var row3_1 = $('
    ').appendTo(row3); + var row3_1 = $('
    ', {style:"display:flex;"}).appendTo(row3); $('
    ',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"}) .text(search) .appendTo(row3_1); - var fromValue = $('',{class:"node-input-rule-property-search-value",type:"text"}) + + function createFromValue() { + return $('',{class:"node-input-rule-property-search-value",type:"text"}) .appendTo(row3_1) .typedInput({default:'str',types:['msg','flow','global','str','re','num','bool','env']}); + } - var row3_2 = $('
    ',{style:"margin-top:8px;"}).appendTo(row3); + var row3_2 = $('
    ',{style:"display:flex;margin-top:8px;"}).appendTo(row3); $('
    ',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"}) .text(replace) .appendTo(row3_2); - var toValue = $('',{class:"node-input-rule-property-replace-value",type:"text"}) + + function createToValue() { + return $('',{class:"node-input-rule-property-replace-value",type:"text"}) .appendTo(row3_2) .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','env']}); + } $('
    ',{style:"display:inline-block;text-align:right; width:120px; padding-right:10px; box-sizing:border-box;"}) .text(to) .appendTo(row4); - var moveValue = $('',{class:"node-input-rule-property-move-value",type:"text"}) + + function createMoveValue() { + return $('',{class:"node-input-rule-property-move-value",type:"text"}) .appendTo(row4) .typedInput({default:'msg',types:['msg','flow','global']}); + } + + let propertyValue = null; + let fromValue = null; + let toValue = null; + let moveValue = null; selectField.on("change", function() { - var width = $("#node-input-rule-container").width(); var type = $(this).val(); + if (propertyValue) { + propertyValue.typedInput('hide'); + } + if (fromValue) { + fromValue.typedInput('hide'); + } + if (toValue) { + toValue.typedInput('hide'); + } + if (moveValue) { + moveValue.typedInput('hide'); + } + if (type == "set") { + if(!propertyValue) { + propertyValue = createPropertyValue(); + } + propertyValue.typedInput('show'); row2.show(); row3.hide(); row4.hide(); } else if (type == "change") { + if(!fromValue) { + fromValue = createFromValue(); + } + fromValue.typedInput('show'); + if(!toValue) { + toValue = createToValue(); + } + toValue.typedInput('show'); row2.hide(); row3.show(); row4.hide(); @@ -167,30 +209,48 @@ row3.hide(); row4.hide(); } else if (type == "move") { + if(!moveValue) { + moveValue = createMoveValue(); + } + moveValue.typedInput('show'); row2.hide(); row3.hide(); row4.show(); } - resizeRule(container); }); selectField.val(rule.t); propertyName.typedInput('value',rule.p); propertyName.typedInput('type',rule.pt); - propertyValue.typedInput('value',rule.to); - propertyValue.typedInput('type',rule.tot); - moveValue.typedInput('value',rule.to); - moveValue.typedInput('type',rule.tot); - fromValue.typedInput('value',rule.from); - fromValue.typedInput('type',rule.fromt); - toValue.typedInput('value',rule.to); - toValue.typedInput('type',rule.tot); + if (rule.t == "set") { + if(!propertyValue) { + propertyValue = createPropertyValue(); + } + propertyValue.typedInput('value',rule.to); + propertyValue.typedInput('type',rule.tot); + } + if (rule.t == "move") { + if(!moveValue) { + moveValue = createMoveValue(); + } + moveValue.typedInput('value',rule.to); + moveValue.typedInput('type',rule.tot); + } + if (rule.t == "change") { + if(!fromValue) { + fromValue = createFromValue(); + } + fromValue.typedInput('value',rule.from); + fromValue.typedInput('type',rule.fromt); + if (!toValue) { + toValue = createToValue(); + } + toValue.typedInput('value',rule.to); + toValue.typedInput('type',rule.tot); + } selectField.change(); - - var newWidth = $("#node-input-rule-container").width(); - resizeRule(container); + container[0].appendChild(fragment); }, - resizeItem: resizeRule, removable: true, sortable: true }); diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html index d20391b59..bb7a2142b 100644 --- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html +++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html @@ -47,6 +47,10 @@
    +
    + + +
    @@ -58,10 +62,13 @@
    - + + +
    @@ -74,6 +81,7 @@ category: 'function', color:"#E6E0F8", defaults: { + name: {value:""}, op1: {value:"1", validate: RED.validators.typedInput("op1type")}, op2: {value:"0", validate: RED.validators.typedInput("op2type")}, op1type: {value:"val"}, @@ -82,8 +90,9 @@ extend: {value:"false"}, units: {value:"ms"}, reset: {value:""}, - bytopic: {value: "all"}, - name: {value:""} + bytopic: {value:"all"}, + topic: {value:"topic",required:true}, + outputs: {value:1} }, inputs:1, outputs:1, @@ -103,6 +112,28 @@ return this.name?"node_label_italic":""; }, oneditprepare: function() { + var that = this; + if (this.topic === undefined) { $("#node-input-topic").val("topic"); } + $("#node-input-topic").typedInput({default:'msg',types:['msg']}); + $("#node-input-bytopic").on("change", function() { + if ($("#node-input-bytopic").val() === "all") { + $("#node-stream-topic").hide(); + } else { + $("#node-stream-topic").show(); + } + }); + + if (this.outputs == 2) { $("#node-input-second").prop('checked', true) } + else { $("#node-input-second").prop('checked', false) } + + $("#node-input-second").change(function() { + if ($("#node-input-second").is(":checked")) { + that.outputs = 2; + } + else { + that.outputs = 1; + } + }); $("#node-then-type").on("change", function() { if ($(this).val() == "block") { $(".node-type-wait").hide(); @@ -177,7 +208,7 @@ } if ($("#node-then-type").val() == "loop") { $("#node-input-duration").val($("#node-input-duration").val() * -1); - } + } } }); diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js index e7e4832a5..091e51ebe 100644 --- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js +++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js @@ -24,6 +24,8 @@ module.exports = function(RED) { this.op2 = n.op2 || "0"; this.op1type = n.op1type || "str"; this.op2type = n.op2type || "str"; + this.second = (n.outputs == 2) ? true : false; + this.topic = n.topic || "topic"; if (this.op1type === 'val') { if (this.op1 === 'true' || this.op1 === 'false') { @@ -112,7 +114,7 @@ module.exports = function(RED) { }); var processMessage = function(msg) { - var topic = msg.topic || "_none"; + var topic = RED.util.getMessageProperty(msg,node.topic) || "_none"; var promise; if (node.bytopic === "all") { topic = "_none"; } node.topics[topic] = node.topics[topic] || {}; @@ -197,6 +199,9 @@ module.exports = function(RED) { node.send(msg2); } delete node.topics[topic]; + + if (node.second === true) { node.send([null,msg2]); } + else { node.send(msg2); } node.status({}); }).catch(err => { node.error(err); @@ -246,7 +251,8 @@ module.exports = function(RED) { } delete node.topics[topic]; node.status({}); - node.send(msg2); + if (node.second === true) { node.send([null,msg2]); } + else { node.send(msg2); } }).catch(err => { node.error(err); }); diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html index e2786b9da..ae0eaedda 100644 --- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html +++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html @@ -170,15 +170,14 @@ $("#node-input-port-row").hide(); $("#node-input-host-row").hide(); $("#node-input-end-row").hide(); + } else if (sockettype == "client"){ + $("#node-input-port-row").show(); + $("#node-input-host-row").show(); + $("#node-input-end-row").show(); } else { $("#node-input-port-row").show(); - $("#node-input-end-row").show(); - } - - if (sockettype == "client") { - $("#node-input-host-row").show(); - } else { $("#node-input-host-row").hide(); + $("#node-input-end-row").show(); } }; updateOptions(); diff --git a/packages/node_modules/@node-red/nodes/core/network/32-udp.js b/packages/node_modules/@node-red/nodes/core/network/32-udp.js index 60e9bec08..894c19d77 100644 --- a/packages/node_modules/@node-red/nodes/core/network/32-udp.js +++ b/packages/node_modules/@node-red/nodes/core/network/32-udp.js @@ -180,6 +180,10 @@ module.exports = function(RED) { node.tout = setTimeout(function() { if (udpInputPortsInUse[p]) { sock = udpInputPortsInUse[p]; + if (node.multicast != "false") { + sock.setBroadcast(true); + sock.setMulticastLoopback(false); + } node.log(RED._("udp.status.re-use",{outport:node.outport,host:node.addr,port:node.port})); if (node.iface) { node.status({text:n.iface+" : "+node.iface}); } } diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html index c7e8fdc58..80778ac1b 100644 --- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html +++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html @@ -28,7 +28,7 @@
    -   
    +   

    @@ -49,8 +49,13 @@
    - -
    @@ -73,7 +78,7 @@ sep: {value:',',required:true,validate:RED.validators.regex(/^.{1,2}$/)}, //quo: {value:'"',required:true}, hdrin: {value:""}, - hdrout: {value:""}, + hdrout: {value:"none"}, multi: {value:"one",required:true}, ret: {value:'\\n'}, temp: {value:""}, @@ -92,6 +97,8 @@ return this.name?"node_label_italic":""; }, oneditprepare: function() { + if (this.hdrout === false) { this.hdrout = "none"; $("#node-input-hdrout").val("none"); } + if (this.hdrout === true) { this.hdrout = "all"; $("#node-input-hdrout").val("all");} if (this.strings === undefined) { this.strings = true; $("#node-input-strings").prop('checked', true); } if (this.skip === undefined) { this.skip = 0; $("#node-input-skip").val("0");} $("#node-input-skip").spinner({ min:0 }); diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js index 5f0cd3e99..15c16da13 100644 --- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js +++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js @@ -26,7 +26,7 @@ module.exports = function(RED) { this.lineend = "\n"; this.multi = n.multi || "one"; this.hdrin = n.hdrin || false; - this.hdrout = n.hdrout || false; + this.hdrout = n.hdrout || "none"; this.goodtmpl = true; this.skip = parseInt(n.skip || 0); this.store = []; @@ -34,6 +34,8 @@ module.exports = function(RED) { this.include_empty_strings = n.include_empty_strings || false; this.include_null_values = n.include_null_values || false; if (this.parsestrings === undefined) { this.parsestrings = true; } + if (this.hdrout === false) { this.hdrout = "none"; } + if (this.hdrout === true) { this.hdrout = "all"; } var tmpwarn = true; var node = this; @@ -51,14 +53,22 @@ module.exports = function(RED) { return col; } node.template = clean(node.template); + node.hdrSent = false; this.on("input", function(msg) { + if (msg.hasOwnProperty("reset")) { + node.hdrSent = false; + } if (msg.hasOwnProperty("payload")) { if (typeof msg.payload == "object") { // convert object to CSV string try { var ou = ""; - if (node.hdrout) { + if (node.hdrout !== "none" && node.hdrSent === false) { + if ((node.template.length === 1) && (node.template[0] === '') && (msg.hasOwnProperty("columns"))) { + node.template = clean((msg.columns || "").split(",")); + } ou += node.template.join(node.sep) + node.ret; + if (node.hdrout === "once") { node.hdrSent = true; } } if (!Array.isArray(msg.payload)) { msg.payload = [ msg.payload ]; } for (var s = 0; s < msg.payload.length; s++) { @@ -77,13 +87,15 @@ module.exports = function(RED) { ou += msg.payload[s].join(node.sep) + node.ret; } else { + if ((node.template.length === 1) && (node.template[0] === '') && (msg.hasOwnProperty("columns"))) { + node.template = clean((msg.columns || "").split(",")); + } if ((node.template.length === 1) && (node.template[0] === '')) { /* istanbul ignore else */ if (tmpwarn === true) { // just warn about missing template once node.warn(RED._("csv.errors.obj_csv")); tmpwarn = false; } - ou = ""; for (var p in msg.payload[0]) { /* istanbul ignore else */ if (msg.payload[0].hasOwnProperty(p)) { @@ -127,6 +139,7 @@ module.exports = function(RED) { } } msg.payload = ou; + msg.columns = node.template.join(','); if (msg.payload !== '') { node.send(msg); } } catch(e) { node.error(e,msg); } @@ -227,6 +240,7 @@ module.exports = function(RED) { a.push(o); // add to the array } var has_parts = msg.hasOwnProperty("parts"); + if (node.multi !== "one") { msg.payload = a; if (has_parts) { @@ -235,12 +249,14 @@ module.exports = function(RED) { } if (msg.parts.index + 1 === msg.parts.count) { msg.payload = node.store; + msg.columns = node.template.filter(val => val).join(','); delete msg.parts; node.send(msg); node.store = []; } } else { + msg.columns = node.template.filter(val => val).join(','); node.send(msg); // finally send the array } } @@ -248,6 +264,7 @@ module.exports = function(RED) { var len = a.length; for (var i = 0; i < len; i++) { var newMessage = RED.util.cloneMessage(msg); + newMessage.columns = node.template.filter(val => val).join(','); newMessage.payload = a[i]; if (!has_parts) { newMessage.parts = { @@ -273,7 +290,11 @@ module.exports = function(RED) { } else { node.warn(RED._("csv.errors.csv_js")); } } - else { node.send(msg); } // If no payload - just pass it on. + else { + if (!msg.hasOwnProperty("reset")) { + node.send(msg); // If no payload and not reset - just pass it on. + } + } }); } RED.nodes.registerType("csv",CSVNode); diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html index 7723cb9b8..3caa0ab0a 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html @@ -40,6 +40,6 @@ progress will be cleared and no message triggered.

    The node can be configured to resend a message at a regular interval until it is reset by a received message.

    -

    Optionally, the node can be configured to treat messages with msg.topic as if they - are separate streams.

    +

    Optionally, the node can be configured to treat messages as if they are separate streams, + using a msg property to identify each stream. Default msg.topic.

    diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index e40d99ea7..e1cfe23bc 100755 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -37,6 +37,7 @@ "stopped": "stopped", "failed": "Inject failed: __error__", "label": { + "properties": "Properties", "repeat": "Repeat", "flow": "flow context", "global": "global context", @@ -79,7 +80,6 @@ "on": "on", "onstart": "Inject once after", "onceDelay": "seconds, then", - "tip": "Note: \"interval between times\" and \"at a specific time\" will use cron.
    \"interval\" should be 596 hours or less.
    See info box for details.", "success": "Successfully injected: __label__", "errors": { "failed": "inject failed, see log for details", @@ -302,7 +302,7 @@ "wait-for": "wait for", "wait-loop": "resend it every", "for": "Handling", - "bytopics": "each msg.topic independently", + "bytopics": "each", "alltopics": "all messages", "duration": { "ms": "Milliseconds", @@ -311,6 +311,7 @@ "h": "Hours" }, "extend": " extend delay if new message arrives", + "second": " send second message to separate output", "label": { "trigger": "trigger", "trigger-block": "trigger & block", @@ -723,6 +724,11 @@ "mac": "Mac (\\r)", "windows": "Windows (\\r\\n)" }, + "hdrout": { + "none": "never send column headers", + "all": "always send column headers", + "once": "send headers once, until msg.reset" + }, "errors": { "csv_js": "This node only handles CSV strings or js objects.", "obj_csv": "No columns template specified for object -> CSV.", diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html index 19ece5ac0..6f16f5b72 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html @@ -38,11 +38,13 @@

    The column template can contain an ordered list of column names. When converting CSV to an object, the column names will be used as the property names. Alternatively, the column names can be taken from the first row of the CSV.

    When converting to CSV, the column template is used to identify which properties to extract from the object and in what order.

    +

    If the template is blank then the node can use a simple comma separated list of properties supplied in msg.columns to + determine what to extract. If that is not present then all the object properties are ouput in the order in which they are found.

    If the input is an array then the columns template is only used to optionally generate a row of column titles.

    If 'parse numerical values' option is checked, string numerical values will be returned as numbers, ie. middle value '1,"1.5",2'.

    If 'include empty strings' option is checked, empty strings will be returned in result, ie. middle value '"1","",3'.

    If 'include null values' option is checked, null values will be returned in result, ie. middle value '"1",,3'.

    -

    The node can accept a multi-part input as long as the parts property is set correctly.

    +

    The node can accept a multi-part input as long as the parts property is set correctly, for example from a file-in node or split node.

    If outputting multiple messages they will have their parts property set and form a complete message sequence.

    Note: the column template must be comma separated - even if a different separator is chosen for the data.

    diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json index e15947fa6..32b59361b 100755 --- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json @@ -302,7 +302,7 @@ "wait-for": "指定した時間待機", "wait-loop": "指定した時間間隔毎に送信を繰り返す", "for": "処理対象", - "bytopics": "msg.topic毎", + "bytopics": "毎", "alltopics": "全メッセージ", "duration": { "ms": "ミリ秒", @@ -719,6 +719,11 @@ "mac": "Mac (\\r)", "windows": "Windows (\\r\\n)" }, + "hdrout": { + "none": "カラムヘッダを送信しない", + "all": "カラムヘッダを常に送信する", + "once": "ヘッダを一度だけ送信する(msg.resetの受け付けると再送)" + }, "errors": { "csv_js": "本ノードが処理できる形式は、CSV文字列またはJSONのみです", "obj_csv": "オブジェクトをCSVへ変換する際の列名が設定されていません" diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index d1120d12c..96e829eaf 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -19,10 +19,10 @@ "body-parser": "1.19.0", "cheerio": "0.22.0", "content-type": "1.0.4", - "cookie-parser": "1.4.4", + "cookie-parser": "1.4.5", "cookie": "0.4.0", "cors": "2.8.5", - "cron": "1.8.2", + "cron": "1.7.2", "denque": "1.4.1", "fs-extra": "8.1.0", "fs.notify": "0.0.4", @@ -33,7 +33,7 @@ "media-typer": "1.1.0", "mqtt": "2.18.8", "multer": "1.4.2", - "mustache": "4.0.0", + "mustache": "4.0.1", "on-headers": "1.0.2", "raw-body": "2.4.1", "request": "2.88.0", diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json index f1d81a2f7..1ac6ce528 100644 --- a/packages/node_modules/@node-red/registry/package.json +++ b/packages/node_modules/@node-red/registry/package.json @@ -18,7 +18,7 @@ "dependencies": { "@node-red/util": "1.1.0", "semver": "6.3.0", - "uglify-js": "3.8.0", + "uglify-js": "3.8.1", "when": "3.7.8" } } diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js index cf1769700..9755681d8 100644 --- a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js +++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js @@ -203,10 +203,10 @@ LocalFileSystem.prototype.open = function(){ var newContext = self.cache._export(); scopes.forEach(function(scope) { var storagePath = getStoragePath(self.storageBaseDir,scope); - var context = newContext[scope]; + var context = newContext[scope] || {}; var stringifiedContext = stringify(context); if (stringifiedContext.circular && !self.knownCircularRefs[scope]) { - log.warn(log._("error-circular",{scope:scope})); + log.warn(log._("context.localfilesystem.error-circular",{scope:scope})); self.knownCircularRefs[scope] = true; } else { delete self.knownCircularRefs[scope]; @@ -324,7 +324,7 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) { } var stringifiedContext = stringify(obj); if (stringifiedContext.circular && !self.knownCircularRefs[scope]) { - log.warn(log._("error-circular",{scope:scope})); + log.warn(log._("context.localfilesystem.error-circular",{scope:scope})); self.knownCircularRefs[scope] = true; } else { delete self.knownCircularRefs[scope]; diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js index 16166fbc1..1a350ce7c 100644 --- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js +++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js @@ -553,7 +553,7 @@ function getFlow(id) { if (flow.label) { result.label = flow.label; } - if (flow.disabled) { + if (flow.hasOwnProperty('disabled')) { result.disabled = flow.disabled; } if (flow.hasOwnProperty('info')) { diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json index 571582b35..16951b6ba 100644 --- a/packages/node_modules/@node-red/util/package.json +++ b/packages/node_modules/@node-red/util/package.json @@ -18,7 +18,7 @@ "clone": "2.1.2", "i18next": "15.1.2", "json-stringify-safe": "5.0.1", - "jsonata": "1.8.1", + "jsonata": "1.8.3", "lodash.clonedeep": "^4.5.0", "when": "3.7.8" } diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index d4c002702..5c7192a20 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -41,7 +41,7 @@ "fs-extra": "8.1.0", "node-red-node-rbe": "^0.2.6", "node-red-node-tail": "^0.1.0", - "nopt": "4.0.1", + "nopt": "4.0.3", "semver": "6.3.0" }, "optionalDependencies": { diff --git a/test/nodes/core/function/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js index 7d7450580..3377ee1f7 100644 --- a/test/nodes/core/function/89-trigger_spec.js +++ b/test/nodes/core/function/89-trigger_spec.js @@ -102,20 +102,20 @@ describe('trigger node', function() { function basicTest(type, val, rval) { it('should output 1st value when triggered ('+type+')', function(done) { var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1:val, op1type:type, op2:"", op2type:"null", duration:"20", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; process.env[val] = rval; helper.load(triggerNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { try { - if (rval) { - msg.should.have.property("payload"); - should.deepEqual(msg.payload, rval); - } - else { - msg.should.have.property("payload", val); - } + if (rval) { + msg.should.have.property("payload"); + should.deepEqual(msg.payload, rval); + } + else { + msg.should.have.property("payload", val); + } delete process.env[val]; done(); } @@ -127,7 +127,7 @@ describe('trigger node', function() { it('should output 2st value when triggered ('+type+')', function(done) { var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1:"foo", op1type:"str", op2:val, op2type:type, duration:"20", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; process.env[val] = rval; helper.load(triggerNode, flow, function() { var n1 = helper.getNode("n1"); @@ -136,17 +136,17 @@ describe('trigger node', function() { n2.on("input", function(msg) { try { if (c === 0) { - msg.should.have.property("payload", "foo"); + msg.should.have.property("payload", "foo"); c++; } else { - if (rval) { - msg.should.have.property("payload"); - should.deepEqual(msg.payload, rval); - } - else { - msg.should.have.property("payload", val); - } + if (rval) { + msg.should.have.property("payload"); + should.deepEqual(msg.payload, rval); + } + else { + msg.should.have.property("payload", val); + } delete process.env[val]; done(); } @@ -378,6 +378,51 @@ describe('trigger node', function() { }); }); + it('should handle multiple other properties individually if asked to do so', function(done) { + var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", bytopic:"topic", topic:"foo", op1:"1", op2:"0", op1type:"num", op2type:"num", duration:"30", wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(triggerNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + try { + c += 1; + if (c === 1) { + msg.should.have.a.property("payload", 1); + msg.should.have.a.property("foo", "A"); + } + else if (c === 2) { + msg.should.have.a.property("payload", 1); + msg.should.have.a.property("foo", "B"); + } + else if (c === 3) { + msg.should.have.a.property("payload", 1); + msg.should.have.a.property("foo", "C"); + } + else if (c === 4) { + msg.should.have.a.property("payload", 0); + msg.should.have.a.property("foo", "A"); + } + else if (c === 5) { + msg.should.have.a.property("payload", 0); + msg.should.have.a.property("foo", "B"); + } + else if (c === 6) { + msg.should.have.a.property("payload", 0); + msg.should.have.a.property("foo", "C"); + done(); + } + } catch(err) { + done(err); + } + }); + n1.emit("input", {payload:1,foo:"A"}); + n1.emit("input", {payload:2,foo:"B"}); + n1.emit("input", {payload:3,foo:"C"}); + }); + }); + it('should be able to return things from flow and global context variables', function(done) { var spy = sinon.stub(RED.util, 'evaluateNodeProperty', function(arg1, arg2, arg3, arg4, arg5) { if (arg5) { arg5(null, arg1) } else { return arg1; } } @@ -408,8 +453,8 @@ describe('trigger node', function() { it('should be able to return things from persistable flow and global context variables', function (done) { var flow = [{"id": "n1", "type": "trigger", "name": "triggerNode", "op1": "#:(memory1)::foo", "op1type": "flow", - "op2": "#:(memory1)::bar", "op2type": "global", "duration": "20", "wires": [["n2"]], "z": "flow" }, - {"id": "n2", "type": "helper"}]; + "op2": "#:(memory1)::bar", "op2type": "global", "duration": "20", "wires": [["n2"]], "z": "flow" }, + {"id": "n2", "type": "helper"}]; helper.load(triggerNode, flow, function () { initContext(function () { var n1 = helper.getNode("n1"); @@ -442,11 +487,11 @@ describe('trigger node', function() { it('should be able to return things from multiple persistable global context variables', function (done) { var flow = [{"id": "n1", "z": "flow", "type": "trigger", - "duration": "20", "wires": [["n2"]], - "op1": "#:(memory1)::val", "op1type": "global", - "op2": "#:(memory2)::val", "op2type": "global" - }, - {"id": "n2", "type": "helper"}]; + "duration": "20", "wires": [["n2"]], + "op1": "#:(memory1)::val", "op1type": "global", + "op2": "#:(memory2)::val", "op2type": "global" + }, + {"id": "n2", "type": "helper"}]; helper.load(triggerNode, flow, function () { initContext(function () { var n1 = helper.getNode("n1"); @@ -481,11 +526,11 @@ describe('trigger node', function() { it('should be able to return things from multiple persistable flow context variables', function (done) { var flow = [{"id": "n1", "z": "flow", "type": "trigger", - "duration": "20", "wires": [["n2"]], - "op1": "#:(memory1)::val", "op1type": "flow", - "op2": "#:(memory2)::val", "op2type": "flow" - }, - {"id": "n2", "type": "helper"}]; + "duration": "20", "wires": [["n2"]], + "op1": "#:(memory1)::val", "op1type": "flow", + "op2": "#:(memory2)::val", "op2type": "flow" + }, + {"id": "n2", "type": "helper"}]; helper.load(triggerNode, flow, function () { initContext(function () { var n1 = helper.getNode("n1"); @@ -520,11 +565,11 @@ describe('trigger node', function() { it('should be able to return things from multiple persistable flow & global context variables', function (done) { var flow = [{"id": "n1", "z": "flow", "type": "trigger", - "duration": "20", "wires": [["n2"]], - "op1": "#:(memory1)::val", "op1type": "flow", - "op2": "#:(memory2)::val", "op2type": "global" - }, - {"id": "n2", "type": "helper"}]; + "duration": "20", "wires": [["n2"]], + "op1": "#:(memory1)::val", "op1type": "flow", + "op2": "#:(memory2)::val", "op2type": "global" + }, + {"id": "n2", "type": "helper"}]; helper.load(triggerNode, flow, function () { initContext(function () { var n1 = helper.getNode("n1"); @@ -818,6 +863,40 @@ describe('trigger node', function() { }); }); + it('should be able to send 2nd message to a 2nd output', function(done) { + var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"val", op1:"hello", op2:"world", duration:"50", outputs:2, wires:[["n2"],["n3"]] }, + {id:"n2", type:"helper"}, {id:"n3", type:"helper"} ]; + helper.load(triggerNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + var c = 0; + n2.on("input", function(msg) { + try { + if (c === 0) { + msg.should.have.a.property("payload", "hello"); + msg.should.have.a.property("topic", "test"); + c+=1; + } + else { done(err); } + } + catch(err) { done(err); } + }); + n3.on("input", function(msg) { + try { + if (c === 1) { + msg.should.have.a.property("payload", "world"); + msg.should.have.a.property("topic", "test"); + done(); + } + else { done(err); } + } + catch(err) { done(err); } + }); + n1.emit("input", {payload:"go",topic:"test"}); + }); + }); + it('should handle string null as null', function(done) { var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"pay", op1:"null", op2:"null", duration:"40", wires:[["n2"]] }, {id:"n2", type:"helper"} ]; diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js index 4d5d7b27a..10e167b6d 100644 --- a/test/nodes/core/parsers/70-CSV_spec.js +++ b/test/nodes/core/parsers/70-CSV_spec.js @@ -1,3 +1,4 @@ +/* eslint-disable no-undef */ /** * Copyright JS Foundation and other contributors, http://js.foundation * @@ -70,12 +71,13 @@ describe('CSV node', function() { it('should convert a simple csv string to a javascript object', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { msg.should.have.property('payload', { a: 1, b: 2, c: 3, d: 4 }); + msg.should.have.property('columns', "a,b,c,d"); check_parts(msg, 0, 1); done(); }); @@ -86,7 +88,7 @@ describe('CSV node', function() { it('should remove quotes and whitespace from template', function(done) { var flow = [ { id:"n1", type:"csv", temp:'"a", "b" , " c "," d " ', wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -102,12 +104,13 @@ describe('CSV node', function() { it('should create column names if no template provided', function(done) { var flow = [ { id:"n1", type:"csv", temp:'', wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { msg.should.have.property('payload', { col1: 1, col2: 2, col3: 3, col4: 4 }); + msg.should.have.property('columns', "col1,col2,col3,col4"); check_parts(msg, 0, 1); done(); }); @@ -118,12 +121,13 @@ describe('CSV node', function() { it('should allow dropping of fields from the template', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,,,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { msg.should.have.property('payload', { a: 1, d: 4 }); + msg.should.have.property('columns', 'a,d'); check_parts(msg, 0, 1); done(); }); @@ -134,7 +138,7 @@ describe('CSV node', function() { it('should leave numbers starting with 0, e and + as strings (except 0.)', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e,f,g", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -150,7 +154,7 @@ describe('CSV node', function() { it('should not parse numbers when told not to do so', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e,f,g", strings:false, wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -166,7 +170,7 @@ describe('CSV node', function() { it('should leave handle strings with scientific notation as numbers', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e,f,g", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -183,7 +187,7 @@ describe('CSV node', function() { it('should allow quotes in the input (but drop blank strings)', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e,f,g,h", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -327,12 +331,13 @@ describe('CSV node', function() { it('should be able to output multiple lines as one array', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", multi:"yes", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); n2.on("input", function(msg) { msg.should.have.property('payload', [ { a: 1, b: 2, c: 3, d: 4 },{ a: 5, b: -6, c: '07', d: '+8' },{ a: 9, b: 0, c: 'a', d: 'b' },{ a: 'c', b: 'd', c: 'e', d: 'f' } ]); + msg.should.have.property('columns','a,b,c,d'); msg.should.not.have.property('parts'); done(); }); @@ -343,7 +348,7 @@ describe('CSV node', function() { it('should handle numbers in strings but not IP addresses', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -359,7 +364,7 @@ describe('CSV node', function() { it('should preserve parts property', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -403,7 +408,7 @@ describe('CSV node', function() { it('should skip several lines from start if requested', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", skip: 2, wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -417,9 +422,9 @@ describe('CSV node', function() { }); }); - it('should skip several lines from start then use next line as a tempate', function(done) { + it('should skip several lines from start then use next line as a template', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", hdrin:true, skip: 2, wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -435,7 +440,7 @@ describe('CSV node', function() { it('should skip several lines from start and correct parts', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", skip: 2, wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -467,11 +472,13 @@ describe('CSV node', function() { n2.on("input", function(msg) { if (c === 0) { msg.should.have.property('payload', { w: 1, x: 2, y: 3, z: 4 }); + msg.should.have.property('columns', 'w,x,y,z'); check_parts(msg, 0, 2); c += 1; } else { msg.should.have.property('payload', { w: 5, x: 6, y: 7, z: 8 }); + msg.should.have.property('columns', 'w,x,y,z'); check_parts(msg, 1, 2); done(); } @@ -495,7 +502,7 @@ describe('CSV node', function() { it('should convert a simple object back to a csv', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -513,7 +520,7 @@ describe('CSV node', function() { it('should convert a simple object back to a csv with no template', function(done) { var flow = [ { id:"n1", type:"csv", temp:" ", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -531,7 +538,7 @@ describe('CSV node', function() { it('should handle a template with spaces in the property names', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b o,c p,,e", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -549,7 +556,7 @@ describe('CSV node', function() { it('should convert an array of objects to a multi-line csv', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -567,7 +574,7 @@ describe('CSV node', function() { it('should convert a simple array back to a csv', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -585,7 +592,7 @@ describe('CSV node', function() { it('should convert an array of arrays back to a multi-line csv', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -603,7 +610,7 @@ describe('CSV node', function() { it('should be able to include column names as first row', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", hdrout:true, ret:"\r\n", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -619,9 +626,36 @@ describe('CSV node', function() { }); }); + it('should be able to pass in column names', function(done) { + var flow = [ { id:"n1", type:"csv", temp:"", hdrout:"once", ret:"\r\n", wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(csvNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var count = 0; + n2.on("input", function(msg) { + count += 1; + try { + if (count === 1) { + msg.should.have.property('payload', 'a,,b,a\r\n4,,3,4\r\n'); + } + if (count === 3) { + msg.should.have.property('payload', '4,,3,4\r\n'); + done() + } + } + catch(e) { done(e); } + }); + var testJson = [{ d: 1, b: 3, c: 2, a: 4 }]; + n1.emit("input", {payload:testJson, columns:"a,,b,a"}); + n1.emit("input", {payload:testJson}); + n1.emit("input", {payload:testJson}); + }); + }); + it('should handle quotes and sub-properties', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -641,7 +675,7 @@ describe('CSV node', function() { it('should just pass through if no payload provided', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -661,7 +695,7 @@ describe('CSV node', function() { it('should warn if provided a number or boolean', function(done) { var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[["n2"]] }, - {id:"n2", type:"helper"} ]; + {id:"n2", type:"helper"} ]; helper.load(csvNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2");