@gregoriusrippenstein/node-red-contrib-nodedev 0.3.7 → 0.3.8

package/nodes/20-pkg-file.html

@@ -108,6 +108,7 @@
         defaults: {
             name: {value:""},
             filename: { value: ""},
+            dirname: { value: "" },
             format: {value:"handlebars"},
             syntax: {value:"mustache"},
             template: {value:""},

package/nodes/lib/tarhelpers.js

@@ -3,13 +3,14 @@ module.exports = (function () {
     var tarStream = require('tar-stream');
     var streamx = require('streamx');
     var pakoGzip = require('pako');
+    let pathUtil = require('path')
 
     /*
      * there is no indication in a tar file of whether a file is binary or textual.
      * we can only make a guess by the extension of the filename.
      ***/
     var computeFormat = (filename) => {
-        var ext = filename.split(".").at(-1);
+        let ext = pathUtil.extname(filename).substr(1).toLowerCase()
 
         return {
             "html": "html",
@@ -39,7 +40,7 @@ module.exports = (function () {
             "mov": "base64",
             "ico": "base64",
             "eot": "base64",
-        }[ext.toLowerCase()] || "text";
+        }[ext] || "text";
     }
 
     var convertTarFile = (RED, tgzData, onFinish, onError) => {
@@ -59,22 +60,23 @@ module.exports = (function () {
             });
 
             stream.on('end', function () {
-                var frmt = computeFormat(header.name.split("/").at(-1));
+                let filenameWithPath = header.name.replace(/^package\//, '')
+                let filename = pathUtil.basename(filenameWithPath)
+                let frmt = computeFormat(filename);
 
                 allFiles.push({
                     id: RED.util.generateId(),
                     type: "PkgFile",
-                    name: header.name.split("/").at(-1),
-                    filename: header.name.replace(/^package\//, ''),
+                    name: filename,
+                    filename: filenameWithPath,
+                    dirname: pathUtil.dirname(filenameWithPath),
                     template: Buffer.concat(buffer).toString(frmt == "base64" ? 'base64' : 'utf8'),
-                    syntax: header.name.replace(/^package\//, '') == "package.json" ? "mustache" : "plain",
+                    syntax: filename == "package.json" ? "mustache" : "plain",
                     format: frmt,
                     output: "str",
-                    x: 250 * Math.floor(allFiles.length / 40),
-                    y: 50 * (allFiles.length % 40),
-                    wires: [
-                        []
-                    ]
+                    x: 0,
+                    y: 0,
+                    wires: [[]]
                 })
 
                 next() // ready for next entry
@@ -84,9 +86,12 @@ module.exports = (function () {
         })
 
         extract.on('finish', function () {
-            // all entries read, wire them together
-            for (var idx = 0; idx < allFiles.length - 1; idx++) {
-                allFiles[idx].wires = [[allFiles[idx + 1].id]];
+            allFiles = allFiles.sort((a, b) => { return a.dirname < b.dirname ? -1 : (a.dirname >  b.dirname ? 1 : 0) } )
+
+            for (var idx = 0; idx < allFiles.length; idx++) {
+                allFiles[idx].x = 250 * Math.floor(idx / 40)
+                allFiles[idx].y = 50 * (idx % 40)
+                allFiles[idx].wires = allFiles[idx + 1] ? [[allFiles[idx + 1].id]] : [[]]
             }
 
             onFinish(allFiles)

package/nodes/node-factory-sidebar-cfg.js

@@ -66,6 +66,20 @@ module.exports = function (RED) {
         }
     }
 
+    function createGroupForDirectory(dirname, allIds) {
+        return {
+            "id": RED.util.generateId(),
+            "type": "group",
+            "name": `Dir: ${dirname}`,
+            "style": {
+                "label": true,
+                "label-position": "ne",
+                "color": "#001f60"
+            },
+            "nodes": allIds
+        }
+    }
+
     function createGroup(pkgname, pversion, allFiles) {
         return {
             "id": RED.util.generateId(), 
@@ -136,19 +150,14 @@ module.exports = function (RED) {
                     if ( msg.pkgname && msg.pkgversion ) {
                         const onFinish = (allFiles) => {
 
-                            /* these are no templates, these are files - no mustache intrepretation */
-                            allFiles.forEach(function(element) {
-                                element.syntax = "plain"
-                            });
-
-                            var lastNode = allFiles[allFiles.length - 1];
+                            var lastNode = allFiles.at(-1);
 
                             var nodeDevOp = createDevOpsNode(msg.pkgname, msg.pkgversion, allFiles[0].x, allFiles[0].y, allFiles[0].id)
                             var nrInstallNode = createNodeRedInstallNode(lastNode.x, lastNode.y)
                             var tarballNode = createTarballNode(lastNode.x, lastNode.y, nrInstallNode.id)
 
                             let pkgjson = allFiles.filter( a => {
-                                return a.filename == "package.json"
+                                return a.filename == "package.json" && a.dirname == "."
                             })[0];
 
                             if ( pkgjson) {
@@ -161,13 +170,29 @@ module.exports = function (RED) {
 
                             lastNode.wires[0].push(tarballNode.id)
 
-                            allFiles.push(nodeDevOp);
-                            allFiles.push(tarballNode);
-                            allFiles.push(nrInstallNode);
+
+                            /* group by dirname */
+                            let groupByDirectory = {}
+                            let dirGroups = []
+                            allFiles.forEach(a => {
+                                (groupByDirectory[a.dirname] ||= []).push(a.id)
+                            })
+
+                            Object.keys(groupByDirectory).forEach(d => {
+                                dirGroups.push(createGroupForDirectory(d, groupByDirectory[d]))
+                            })
+
+                            let nodeDevNodes = [
+                                nodeDevOp,
+                                tarballNode,
+                                nrInstallNode
+                            ]
 
                             allFiles = [
-                                createGroup(msg.pkgname, nodeDevOp.pversion || msg.pkgversion, allFiles)
-                            ].concat(allFiles);
+                                createGroup(msg.pkgname, nodeDevOp.pversion || msg.pkgversion, dirGroups.concat(nodeDevNodes))
+// @ts-ignore
+                            ].concat(dirGroups).concat(nodeDevNodes).concat(allFiles);   
+
 
                             RED.comms.publish(
                                 "nodedev:perform-autoimport-nodes",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@gregoriusrippenstein/node-red-contrib-nodedev",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "dependencies": {
     "pako":          "^2.1.0",
     "tar-stream":    "^3.1.6",