node-red-contrib-typescript 1.0.3 → 1.0.5

package/helper.js

@@ -217,6 +217,7 @@ function createScript(node, iniOpt, code) {
     var iniText = `
         (async function(__send__) {
             node.status({});
+            node.log(undefined);
             ${ts.transpile(code)}
         })();`;
     return new vm.Script(iniText, iniOpt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-typescript",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "author": "kezziny",
   "license": "ISC",

package/src/instance/instance.js

@@ -64,7 +64,14 @@ module.exports = function(RED) {
                 target = target.substring(1);
             }
             if (target.startsWith("./")) {
-                target = path + target.substring(2);
+                if (node.config.name.indexOf("/") !== -1) {
+                    let count = node.config.name.lastIndexOf("/") + 1;
+                    let pathSuffix = node.config.name.substring(0, count);
+                    target = path + pathSuffix + target.substring(2);
+                }
+                else {
+                    target = path + target.substring(2);
+                }
             }
             if (target.endsWith(".pkg")) {
                 target = target.substring(0, target.length - 4) + "/index";
@@ -115,8 +122,14 @@ module.exports = function(RED) {
                         target = target.substring(1);
                     }
                     if (target.startsWith("./")) {
-                        target = path + target.substring(2);
-                    }
+                        if (node.config.name.indexOf("/") !== -1) {
+                            let count = node.config.name.lastIndexOf("/") + 1;
+                            let pathSuffix = node.config.name.substring(0, count);
+                            target = path + pathSuffix + target.substring(2);
+                        }
+                        else {
+                            target = path + target.substring(2);
+                        }                    }
                     if (target.endsWith(".pkg")) {
                         target = target.substring(0, target.length - 4) + "/index";
                     }
@@ -164,4 +177,4 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("typescript", TypescriptInstance);
-}
+}

package/node-red-contrib-typescript/README.md

@@ -1 +0,0 @@
-

package/node-red-contrib-typescript/helper.js

@@ -1,230 +0,0 @@
-var ts = require("./typescript.js");
-var util = require("util");
-var vm = require("vm");
-
-function sendResults(node,send,_msgid,msgs,cloneFirstMessage) {
-    if (msgs == null) {
-        return;
-    } else if (!util.isArray(msgs)) {
-        msgs = [msgs];
-    }
-    var msgCount = 0;
-    for (var m=0; m<msgs.length; m++) {
-        if (msgs[m]) {
-            if (!util.isArray(msgs[m])) {
-                msgs[m] = [msgs[m]];
-            }
-            for (var n=0; n < msgs[m].length; n++) {
-                var msg = msgs[m][n];
-                if (msg !== null && msg !== undefined) {
-                    if (typeof msg === 'object' && !Buffer.isBuffer(msg) && !util.isArray(msg)) {
-                        if (msgCount === 0 && cloneFirstMessage !== false) {
-                            msgs[m][n] = RED.util.cloneMessage(msgs[m][n]);
-                            msg = msgs[m][n];
-                        }
-                        msg._msgid = _msgid;
-                        msgCount++;
-                    } else {
-                        var type = typeof msg;
-                        if (type === 'object') {
-                            type = Buffer.isBuffer(msg)?'Buffer':(util.isArray(msg)?'Array':'Date');
-                        }
-                        node.error(RED._("function.error.non-message-returned",{ type: type }));
-                    }
-                }
-            }
-        }
-    }
-    if (msgCount>0) {
-        send(msgs);
-    }
-}
-
-function createVMOpt(node, kind) {
-    var opt = {
-        filename: 'Function node'+kind+':'+node.id+(node.name?' ['+node.name+']':''), // filename for stack traces
-        displayErrors: true
-        // Using the following options causes node 4/6 to not include the line number
-        // in the stack output. So don't use them.
-        // lineOffset: -11, // line number offset to be used for stack traces
-        // columnOffset: 0, // column number offset to be used for stack traces
-    };
-    return opt;
-}
-
-function sendDataToClient2(RED, node, data) {
-    try {
-        RED.comms.publish(
-            "typescript-log-" + node.id, 
-            {
-                id: node.id,
-                data: data
-            }, 
-            true
-        );
-    }
-    catch (e) {
-        console.log(e);
-    }
-}
-
-function createSandbox(RED, node) {
-    node.outstandingTimers = [];
-    node.outstandingIntervals = [];
-
-    var sandbox = {
-        exports: {},
-        console:console,
-        util:util,
-        Buffer:Buffer,
-        Date: Date,
-        RED: {
-            util: RED.util
-        },
-        node: {
-            id: node.id,
-            name: node.name,
-            path: node._path,
-            outputCount: node.outputs,
-            log: (data) => sendDataToClient2(RED, node, data),
-            error: function() {
-                node.error.apply(node, arguments);
-            },
-            warn: function() {
-                node.warn.apply(node, arguments);
-            },
-            debug: function() {
-                node.debug.apply(node, arguments);
-            },
-            trace: function() {
-                node.trace.apply(node, arguments);
-            },
-            send: function(send, id, msgs, cloneMsg) {
-                sendResults(node, send, id, msgs, cloneMsg);
-            },
-            on: function() {
-                node.on.apply(node, arguments);
-            },
-            status: function() {
-                node.status.apply(node, arguments);
-            },
-            send: function(msg) {
-                node.send(msg);
-            }
-        },
-        context: {
-            set: function() {
-                node.context().set.apply(node,arguments);
-            },
-            get: function() {
-                return node.context().get.apply(node,arguments);
-            },
-            keys: function() {
-                return node.context().keys.apply(node,arguments);
-            },
-            get global() {
-                return node.context().global;
-            },
-            get flow() {
-                return node.context().flow;
-            }
-        },
-        flow: {
-            set: function() {
-                node.context().flow.set.apply(node,arguments);
-            },
-            get: function() {
-                return node.context().flow.get.apply(node,arguments);
-            },
-            keys: function() {
-                return node.context().flow.keys.apply(node,arguments);
-            }
-        },
-        global: {
-            set: function() {
-                node.context().global.set.apply(node,arguments);
-            },
-            get: function() {
-                return node.context().global.get.apply(node,arguments);
-            },
-            keys: function() {
-                return node.context().global.keys.apply(node,arguments);
-            }
-        },
-        env: {
-            get: function(envVar) {
-                return RED.util.getSetting(node, envVar);
-            }
-        },
-        setTimeout: function () {
-            var func = arguments[0];
-            var timerId;
-            arguments[0] = function() {
-                sandbox.clearTimeout(timerId);
-                try {
-                    func.apply(node,arguments);
-                } catch(err) {
-                    node.error(err,{});
-                }
-            };
-            timerId = setTimeout.apply(node,arguments);
-            node.outstandingTimers.push(timerId);
-            return timerId;
-        },
-        clearTimeout: function(id) {
-            clearTimeout(id);
-            var index = node.outstandingTimers.indexOf(id);
-            if (index > -1) {
-                node.outstandingTimers.splice(index,1);
-            }
-        },
-        setInterval: function() {
-            var func = arguments[0];
-            var timerId;
-            arguments[0] = function() {
-                try {
-                    func.apply(node,arguments);
-                } catch(err) {
-                    node.error(err,{});
-                }
-            };
-            timerId = setInterval.apply(node,arguments);
-            node.outstandingIntervals.push(timerId);
-            return timerId;
-        },
-        clearInterval: function(id) {
-            clearInterval(id);
-            var index = node.outstandingIntervals.indexOf(id);
-            if (index > -1) {
-                node.outstandingIntervals.splice(index,1);
-            }
-        }
-    };
-    if (util.hasOwnProperty('promisify')) {
-        sandbox.setTimeout[util.promisify.custom] = function(after, value) {
-            return new Promise(function(resolve, reject) {
-                sandbox.setTimeout(function(){ resolve(value); }, after);
-            });
-        };
-        sandbox.promisify = util.promisify;
-    }
-
-    return sandbox;
-}
-
-function createScript(node, iniOpt, code) {
-    //console.log(ts.transpile(code));
-    var iniText = `
-        (async function(__send__) {
-            node.status({});
-            ${ts.transpile(code)}
-        })();`;
-    return new vm.Script(iniText, iniOpt);
-}
-
-module.exports = {
-    createSandbox: createSandbox,
-    createScript: createScript,
-    createVMOpt: createVMOpt,
-    transpile: ts.transpile
-};

package/node-red-contrib-typescript/package.json

@@ -1,12 +0,0 @@
-{
-  "name": "node-red-contrib-typescript",
-  "version": "1.0.1",
-  "description": "",
-  "author": "kezziny",
-  "license": "ISC",
-  "node-red" : {
-    "nodes": {
-      "instance": "src/instance/instance.js"
-    }
-}
-}

package/node-red-contrib-typescript/src/instance/instance.html

@@ -1,271 +0,0 @@
-<script type="text/javascript">
-    var typescriptRenderLog = function (id, data, node) {
-        let $chart = document.getElementById("data-view-output-chart-" + id);
-        if (!$chart) {
-            const $container = document.getElementById(id)
-            if (!$container) { return }
-            const text = document.createElementNS("http://www.w3.org/2000/svg", 'text')
-            text.setAttribute('id', `data-view-output-text-${id}`)
-            text.setAttribute('x', `0`)
-            text.setAttribute('y', `45`)
-            text.setAttribute('text-anchor', `start`)
-            $container.insertBefore(text, $container.lastChild.nextSibling);
-            // Creat group
-            const group = document.createElementNS("http://www.w3.org/2000/svg", 'g');
-            group.setAttribute('id', `data-view-output-chart-${id}`);
-            group.setAttribute('innerHTML', `data-view-output-chart-${id}`);
-            $container.insertBefore(group, $container.lastChild.nextSibling);
-            $chart = $container
-        }
-
-        let $text = document.getElementById(`data-view-output-text-${id}`);
-        $text.textContent = ''
-        let x = ``
-        if (data === undefined) {
-            x = "";
-        } else if (typeof data == `object`) {
-            x = JSON.stringify(data, null, '  ')
-        } else {
-            x = data + ''
-        }
-        var
-            lines = x.split('\n'),
-            tn,
-            ts
-
-        lines.forEach(function (value, index) {
-            let countSpace = value.length - value.trim().length
-            tn = document.createTextNode(value);
-            ts = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
-            ts.setAttribute('dy', "1.2em");
-            ts.setAttribute('x', (countSpace * 10) + 10);
-            ts.setAttribute('text-anchor', 'start');
-            ts.setAttribute('fill', '#555');
-            ts.setAttribute('stroke', 'transparent');
-            ts.setAttribute('font-size', `11`)
-            ts.appendChild(tn);
-            $text.append(ts);
-        });
-    }
-
-    function typescriptLogSubscriptionHandler(event, data) {
-        console.log(data);
-        if (data.hasOwnProperty("data")) {
-            let node = RED.nodes.node(data.id);
-            typescriptRenderLog(data.id, data.data, node);
-        }
-    }
-    
-    class TSEditor {
-        constructor(node, path) {
-            this.node = node;
-
-            const mainModel = monaco.editor.createModel(
-                node.code || "",
-                'typescript',
-                window.monaco.Uri.parse('file://' + path)
-            );
-
-            this.editor = RED.editor.createEditor({
-                id: "node-input-example-editor",
-                mode: 'ace/mode/typescript',
-                value: node.code || "",
-                theme: "vs-dark",
-                focus: true,
-                model: mainModel,
-            });
-
-            window.monaco.editor.getModels()[0].dispose();
-
-            window.monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
-                    "paths": {
-                        "/*": [
-                            "file:///*"
-                        ],
-                        "#*": [
-                            "file:///lib/*"
-                        ]
-                    },
-                    experimentalDecorators: true,
-                    moduleResolution: window.monaco.languages.typescript.ModuleResolutionKind.NodeJs,
-                    allowNonTsExtensions: true,
-                    module: monaco.languages.typescript.ModuleKind.ESNext,
-                    target: monaco.languages.typescript.ScriptTarget.ESNext
-            });
-        }
-
-        recalculateGlobal(subflowId) {
-            let nodes = [];
-            let subflowNodes = [];
-            let workspaces = [];
-            let subflows = [];
-
-            RED.nodes.eachWorkspace(item => workspaces.push(item));
-            RED.nodes.eachSubflow(item => subflows.push(item));
-            RED.nodes.eachNode(item => {
-                if (item.type === "typescript")
-                    nodes.push(item);
-                if (item.type.startsWith("subflow:"))
-                    subflowNodes.push(item);
-            });
-
-            function resolveFlow(id) {
-                let imports = {};
-                nodes
-                    .filter(node => node.z === id)
-                    .forEach(node => {
-                        imports[`/${encodeURIComponent(node.name)}.ts`] = node.code;
-                    });
-                subflowNodes
-                    .filter(node => node.z === id)
-                    .forEach(node => {
-                        let subImports = resolveFlow(node.type.split(":")[1]);
-                        for (let key in subImports) {
-                            imports[`/${encodeURIComponent(node.name)}${key}`] = subImports[key];
-                        }
-                    });
-                return imports;
-            }
-
-
-            let imports = {};
-            workspaces.forEach(workspace => {
-                let subImports = resolveFlow(workspace.id);
-                for (let key in subImports) {
-                    if (key.indexOf("//") === -1)
-                        imports[`/${encodeURIComponent(workspace.label)}${key}`] = subImports[key];
-                }
-            });
-
-            if (subflowId) {
-                let subflow = subflows.find(s => s.id === subflowId);
-                let subImports = resolveFlow(subflowId);
-                for (let key in subImports) {
-                    if (key.indexOf("//") === -1)
-                        imports[`/subflow${key}`] = subImports[key];
-                }
-            }
-
-            for (let key in imports) {
-                window.monaco.languages.typescript.typescriptDefaults.addExtraLib(imports[key], "file://" + key);
-            }
-
-            window.monaco.languages.typescript.typescriptDefaults.addExtraLib(`
-                let node = {
-                    error: (msg:any) => {},
-                    send: (msg:any) => {},
-                    on: (topic:"close"|"input", callback:any) => {},
-                    status: (status:{fill?:"red"|"yellow"|"green"|"blue"|"grey", shape?:"dot"|"ring", text?:string}) => {},
-                    log: (data:any) => {}
-                };
-                let flow = {
-                    get: (topic:string):any => {};
-                    set: (topic:string, value:any) => {};
-                };
-                let global = {
-                    get: (topic:string):any => {};
-                    set: (topic:string, value:any) => {};
-                };
-                let context = {
-                    get: (topic:string):any => {};
-                    set: (topic:string, value:any) => {};
-                };
-                let env = {
-                    get: (topic:string):any => {};
-                    set: (topic:string, value:any) => {};
-                };
-                `, 'global.d.ts'
-            );
-        }
-
-        getCode() {
-            return this.editor.getValue();
-        }
-
-        destroy() {
-            this.editor.destroy();
-        }
-    }
-</script>
-<script type="text/javascript">
-    RED.nodes.registerType('typescript',{
-        category: 'function',
-        color: '#3178c6',
-        defaults: {
-            name: {value:""},
-            outputs:{value:1},
-            code: {value:""},
-        },
-        inputs:1,
-        outputs:1,
-        icon: "function.svg",
-        label: function () {
-            RED.comms.unsubscribe('typescript-log-' + this.id, typescriptLogSubscriptionHandler);
-            RED.comms.subscribe('typescript-log-' + this.id, typescriptLogSubscriptionHandler);
-            return this.name || "typescript";
-        },
-        oneditprepare: function() {
-            let path = "/__editor__.tsx";
-
-            let workspaces = [];
-            let subflows = [];
-
-            RED.nodes.eachWorkspace(item => workspaces.push(item));
-            RED.nodes.eachSubflow(item => subflows.push(item));
-
-            let target = this;
-            if (workspaces.some(wf => wf.id === target.z)) {
-                target = workspaces.find(wf => wf.id === target.z);
-                path = `/${target.label}${path}`;
-            } else if (subflows.some(wf => wf.id === target.z)) {
-                target = subflows.find(wf => wf.id === target.z);
-                path = `/subflow${path}`;
-            }
-        
-            this.view = {
-                editor: new TSEditor(this, path),
-            };
-
-            this.view.editor.recalculateGlobal(path.startsWith("/subflow") ? this.z : null);
-
-            $( "#node-input-outputs" ).spinner({
-                min: 0,
-                max: 500,
-                change: function(event, ui) {
-                    var value = parseInt(this.value);
-                    value = isNaN(value) ? 1 : value;
-                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
-                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
-                    if (value !== this.value) { $(this).spinner("value", value); }
-                }
-            });
-        },
-        oneditsave: function() {
-            this.code = this.view.editor.getCode();
-            this.view.editor.destroy();
-            delete this.view;
-        },
-        oneditcancel: function() {
-            this.view.editor.destroy();
-            delete this.view;
-        }
-    });
-</script>
-
-<script type="text/html" data-template-name="typescript">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-outputs"><i class="fa fa-random"></i> <span data-i18n="function.label.outputs"></span></label>
-        <input id="node-input-outputs" style="width: 60px;" value="1">
-    </div>
-    
-    <div style="height: calc(100% - 68px); min-height:250px; width: 800px" class="node-text-editor" id="node-input-example-editor"></div>
-</script>
-
-<script type="text/html" data-help-name="typescript">
-    <p>A simple node that converts the message payloads into all lower-case characters</p>
-</script>