@dualbox/editor 1.0.39 → 1.0.41

package/js/src/m/GraphModel.js

@@ -41,7 +41,9 @@ class GraphModel {
             windows: null
         };
         this.data.app = this.data.root;
-        this.data.windows = [[this.e.rootAppName, this.data.app]];
+        this.data.windows = [
+            [this.e.rootAppName, this.data.app]
+        ];
 
         // An object to save/restore different states of this.data (ctrl-z/ctrl-y)
         this.history = new History(this);
@@ -60,7 +62,9 @@ class GraphModel {
 
         this.data.root = json;
         this.data.app = this.data.root; // reset ptr
-        this.data.windows = [[this.e.rootAppName, this.data.app]];
+        this.data.windows = [
+            [this.e.rootAppName, this.data.app]
+        ];
 
         await this.addNativeTypes();
 
@@ -336,24 +340,21 @@ class GraphModel {
                 return false;
             }
             var node = this.data.app.modules[id] = desc;
-        }
-        else if (utils.isUI(pkg.name)) {
+        } else if (utils.isUI(pkg.name)) {
             this.ensure('ui');
             if (this.data.app.ui[id]) {
                 console.error('Could not add ui ' + id + ': already exists');
                 return false;
             }
             var node = this.data.app.ui[id] = desc;
-        }
-        else {
+        } else {
             // may be a metanode
             var nodeDef = idx(this.data.app, o => o.metanodes[pkg.name]);
             if (nodeDef) {
                 this.ensure('modules');
                 var node = this.data.app.modules[id] = desc;
                 return node;
-            }
-            else {
+            } else {
                 throw pkg.name + " is not module or ui, can't add node !";
             }
         }
@@ -468,8 +469,7 @@ class GraphModel {
         try {
             var n = this.getNode(id);
             return true;
-        }
-        catch (e) {
+        } catch (e) {
             return false;
         }
     }
@@ -501,8 +501,7 @@ class GraphModel {
                         .concat(_.map(_.keys(this.data.app.output), k => this.outputPrefix + k))
                         .concat(_.keys(this.data.app.modules))
                         .concat(_.keys(this.data.app.ui));
-                }
-                else {
+                } else {
                     throw new Error('unknown node type: ' + type);
                 }
         }
@@ -549,11 +548,9 @@ class GraphModel {
         node.graphId = id; // for UIs and modules
         if (pkgName.startsWith('@dualbox/dualbox-module-') || pkgName.startsWith('dualbox-core')) {
             node.type = "module";
-        }
-        else if (pkgName.startsWith('@dualbox/dualbox-ui-')) {
+        } else if (pkgName.startsWith('@dualbox/dualbox-ui-')) {
             node.type = "ui";
-        }
-        else {
+        } else {
             throw "pkg " + pkgName + " does not appear to be a module or ui";
         }
 
@@ -585,11 +582,9 @@ class GraphModel {
     prefixId(id, type) {
         if (type == "input" && !id.startsWith('in-')) {
             return this.inputPrefix + id;
-        }
-        else if (type == "output" && !id.startsWith('out-')) {
+        } else if (type == "output" && !id.startsWith('out-')) {
             return this.outputPrefix + id;
-        }
-        else {
+        } else {
             return id;
         }
     }
@@ -598,8 +593,7 @@ class GraphModel {
         if (typeof v == "string" && v.startsWith('____dualbox_storage')) {
             var id = v.replace("____dualbox_storage(", "").slice(0, -1);
             return this.data.root.snapshotObjects[id];
-        }
-        else {
+        } else {
             return v;
         }
     }
@@ -621,27 +615,22 @@ class GraphNode {
                 this.type = "input";
                 this.graphId = id.substring(3); // the id to identify it in the dualbox graph
                 this.def = this.app.input[this.graphId];
-            }
-            else if (id.startsWith(this.m.outputPrefix)) {
+            } else if (id.startsWith(this.m.outputPrefix)) {
                 this.type = "output";
                 this.graphId = id.substring(4);
                 this.def = this.app.output[this.graphId];
-            }
-            else if (this.app.modules && this.app.modules[id]) {
+            } else if (this.app.modules && this.app.modules[id]) {
                 this.graphId = id;
                 this.type = "module";
                 this.def = this.app.modules[this.graphId];
-            }
-            else if (this.app.ui && this.app.ui[id]) {
+            } else if (this.app.ui && this.app.ui[id]) {
                 this.graphId = id;
                 this.type = "ui";
                 this.def = this.app.ui[this.graphId];
-            }
-            else {
+            } else {
                 throw "Cant find node " + id;
             }
-        }
-        else {
+        } else {
             this.def = null;
             this.graphId = null;
         }
@@ -687,8 +676,9 @@ class GraphNode {
 
     // return the input links for a node
     getNormalizeLinksDef() {
-        return this.type == "input" || this.type == "output" ?
-            { "value": this.def.link } :
+        return this.type == "input" || this.type == "output" ? {
+                "value": this.def.link
+            } :
             this.def.links;
     }
 
@@ -730,8 +720,7 @@ class GraphNode {
                 }
             }
             return r;
-        }
-        else {
+        } else {
             switch (this.type) {
                 case "input":
                 case "output":
@@ -753,25 +742,59 @@ class GraphNode {
     // return the assigned input type if there is one. Else, return the module's definition type for this input
     // Also, take loops into account
     getInputType(inputName) {
-        var assignedType = _.get(this.def, ["assignedTypes", "input", inputName]);
+        var assignedType = this.getInputAssignedType(inputName);
         var t = assignedType ? assignedType : this.getDefinitionInputType(inputName);
         return this.hasIterator(inputName) ? "Array<" + t + ">" : t;
     }
 
     // return the assigned input type if there is one. Else, return the module's definition type for this input
-    getAttributeType(inputName) {
-        var assignedType = _.get(this.def, ["assignedTypes", "input", inputName]);
+    getAttributeType(attrName) {
+        var assignedType = this.getAttributeAssignedType(attrName);
         return assignedType ? assignedType : this.getDefinitionAttributeType(inputName);
     }
 
+    getInputAssignedType(inputName) {
+        return _.get(this.def, ["assignedTypes", "input", inputName]);
+    }
+
+    getAttributeAssignedType(attrName) {
+        return _.get(this.def, ["assignedTypes", "attr", attrName]);
+    }
+
     getDefinitionInputType(inputName) {
         if ((this.isInput() || this.isOutput()) && inputName == "value") {
             return this.getType();
-        }
-        else {
+        } else {
             var pkg = this.getPackage();
-            var type = pkg && pkg.dualbox && pkg.dualbox.input && pkg.dualbox.input[inputName] && pkg.dualbox.input[inputName].type || "*";
-            return type;
+            var type = _.get(pkg, ["dualbox", "input", inputName, "type"]) || "*";
+
+            if (type === "*") {
+                return this.getLinkedType(inputName);
+            } else {
+                return type;
+            }
+        }
+    }
+
+    // resolve typelinks, if some other linked input has user-assigned type already
+    getLinkedType(inputName) {
+        var linkedType = "*";
+        var inputsDescription = _.get(this.getPackage(), ["dualbox", "input"]);
+        var inputDef = inputsDescription[inputName];
+        if (inputDef.typeLink) {
+            var typeLink = inputDef.typeLink;
+            var linkedInputs = _.pickBy(inputsDescription, v => v.typeLink === typeLink); // linked inputs
+            _.each(linkedInputs, (linkedInputDef, linkedInputName) => {
+                var assignedType = this.getInputAssignedType(linkedInputName);
+                if (assignedType !== undefined && assignedType !== null) {
+                    linkedType = assignedType;
+                    return false; // eol
+                }
+            });
+
+            return linkedType;
+        } else {
+            return inputDef.type; // should be "*"
         }
     }
 
@@ -815,8 +838,7 @@ class GraphNode {
     getDescription() {
         if (this.def.desc) {
             return this.def.desc;
-        }
-        else {
+        } else {
             var pkg = this.getPackage();
             return pkg && pkg.description;
         }
@@ -827,9 +849,11 @@ class GraphNode {
         var pkgDefault = pkg && pkg.dualbox && pkg.dualbox.input && pkg.dualbox.input[inputName] && pkg.dualbox.input[inputName].value;
         var appDefault = this.def.defaultInputs && this.def.defaultInputs[inputName];
 
-        if (appDefault !== undefined) { return appDefault; }
-        else if (pkgDefault !== undefined) { return pkgDefault; }
-        else return undefined;
+        if (appDefault !== undefined) {
+            return appDefault;
+        } else if (pkgDefault !== undefined) {
+            return pkgDefault;
+        } else return undefined;
     }
 
     setInputDefaultValue(inputName, val) {
@@ -853,15 +877,13 @@ class GraphNode {
     getOutputType(outputName) {
         if ((this.isInput() || this.isOutput()) && outputName == "value") {
             return this.getType();
-        }
-        else {
+        } else {
             var pkg = this.getPackage();
             var type = idx(pkg, o => o.dualbox.output[outputName].type) || "*";
             if (this.hasLoop()) {
                 // if this output is not a feedback, "arrayize" it
                 return this.hasFeedback(outputName) ? type : "Array<" + type + ">";
-            }
-            else {
+            } else {
                 return type;
             }
         }
@@ -901,9 +923,11 @@ class GraphNode {
         var pkg = this.getPackage();
         var pkgDefault = pkg && pkg.dualbox && pkg.dualbox.attr && pkg.dualbox.attr[attrName].value;
         var appDefault = this.def.attr && this.def.attr[attrName];
-        if (appDefault !== undefined) { return appDefault; }
-        else if (pkgDefault !== undefined) { return pkgDefault; }
-        else return undefined;
+        if (appDefault !== undefined) {
+            return appDefault;
+        } else if (pkgDefault !== undefined) {
+            return pkgDefault;
+        } else return undefined;
     }
 
     setAttributeValue(attrName, val) {
@@ -930,17 +954,14 @@ class GraphNode {
             // it's a get
             if (srcType === "input") {
                 return this.getInputDefaultValue(name);
-            }
-            else if (srcType === "attr") {
+            } else if (srcType === "attr") {
                 return this.getAttributeValue(name);
             }
-        }
-        else {
+        } else {
             // it's a set
             if (srcType === "input") {
                 return this.setInputDefaultValue(name, val);
-            }
-            else if (srcType === "attr") {
+            } else if (srcType === "attr") {
                 return this.setAttributeValue(name, val);
             }
         }
@@ -957,8 +978,7 @@ class GraphNode {
     getValueType(srcType, name) {
         if (srcType === "input") {
             return this.getInputType(name);
-        }
-        else if (srcType === "attr") {
+        } else if (srcType === "attr") {
             return this.getAttributeType(name);
         }
     }
@@ -1221,17 +1241,14 @@ class GraphNode {
     isInputVisible(inputName) {
         if (this.isInput() || this.isOutput()) {
             return true;
-        }
-        else {
+        } else {
             if (this.isInputConnected(inputName)) {
                 return true;
-            }
-            else {
+            } else {
                 var val = idx(this.def, o => o.graph.in.visible[inputName]);
                 if (val !== undefined) {
                     return val !== false;
-                }
-                else {
+                } else {
                     // check if the app did set a default value for this input
                     var defaultVal = idx(this.def, o => o.defaultInputs[inputName]);
                     if (defaultVal !== undefined) {
@@ -1244,15 +1261,12 @@ class GraphNode {
                     if (pkgDef) {
                         if (pkgDef.visible === false) {
                             return false;
-                        }
-                        else if (pkgDef.value !== undefined) {
+                        } else if (pkgDef.value !== undefined) {
                             return false;
-                        }
-                        else {
+                        } else {
                             return true;
                         }
-                    }
-                    else {
+                    } else {
                         return true;
                     }
                 }
@@ -1263,17 +1277,14 @@ class GraphNode {
     isOutputVisible(outputName) {
         if (this.isInput() || this.isOutput()) {
             return true;
-        }
-        else {
+        } else {
             if (this.isOutputConnected(outputName)) {
                 return true;
-            }
-            else {
+            } else {
                 var val = idx(this.def, o => o.graph.out.visible[outputName]);
                 if (val === false) {
                     return false;
-                }
-                else {
+                } else {
                     var pkg = this.getPackage();
                     var pkgDef = idx(pkg, o => o.dualbox.output[outputName]);
                     return pkgDef.visible !== false;
@@ -1348,11 +1359,9 @@ class GraphNode {
     isInputResolvable(input) {
         if (this.hasDefaultValue(input)) {
             return true;
-        }
-        else if (this.isInputConnected(input)) {
+        } else if (this.isInputConnected(input)) {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -1436,8 +1445,7 @@ class GraphNode {
         if ((this.isInput() || this.isOutput()) && inputName === "value") {
             var targetId = this.isInput() ? "input" : "output";
             var targetInput = this.graphId;
-        }
-        else {
+        } else {
             var targetId = this.graphId;
             var targetInput = inputName;
         }
@@ -1457,8 +1465,7 @@ class GraphNode {
         if ((this.isInput() || this.isOutput()) && outputName === "value") {
             var sourceId = this.isInput() ? "input" : "output";
             var sourceOutput = this.graphId;
-        }
-        else {
+        } else {
             var sourceId = this.graphId;
             var sourceOutput = outputName;
         }
@@ -1548,7 +1555,10 @@ class GraphNode {
     }
 
     getPosition() {
-        var pos = this.def.graph && this.def.graph.position || { left: 0, top: 0 };
+        var pos = this.def.graph && this.def.graph.position || {
+            left: 0,
+            top: 0
+        };
         pos.top = parseInt(pos.top);
         pos.left = parseInt(pos.left);
         return pos;
@@ -1569,8 +1579,7 @@ class GraphNode {
                 if (nodeId == id) {
                     if (this.isInput() || this.isOutput()) {
                         delete this.def.link;
-                    }
-                    else {
+                    } else {
                         delete this.def.links[inputName];
                     }
                 }
@@ -1615,10 +1624,18 @@ class GraphNode {
 
     addTo(app) {
         switch (this.type) {
-            case "module": app.modules[this.graphId] = this.def; break;
-            case "ui": app.ui[this.graphId] = this.def; break;
-            case "input": app.input[this.graphId] = this.def; break;
-            case "output": app.output[this.graphId] = this.def; break;
+            case "module":
+                app.modules[this.graphId] = this.def;
+                break;
+            case "ui":
+                app.ui[this.graphId] = this.def;
+                break;
+            case "input":
+                app.input[this.graphId] = this.def;
+                break;
+            case "output":
+                app.output[this.graphId] = this.def;
+                break;
             default:
                 throw "wtf";
         }
@@ -1629,8 +1646,12 @@ class GraphNode {
         this.detachEvents();
 
         switch (this.type) {
-            case "module": delete app.modules[this.graphId]; break;
-            case "ui": delete app.ui[this.graphId]; break;
+            case "module":
+                delete app.modules[this.graphId];
+                break;
+            case "ui":
+                delete app.ui[this.graphId];
+                break;
             case "input":
                 delete app.input[this.graphId];
                 if (!this.m.isRootApp(app)) {
@@ -1732,22 +1753,18 @@ class GraphNode {
             if (this.isInput()) {
                 if (newId.startsWith(this.m.inputPrefix)) {
                     newGraphId = newId.substring(3);
-                }
-                else {
+                } else {
                     newGraphId = newId;
                     newId = this.m.inputPrefix + newId;
                 }
-            }
-            else if (this.isOutput()) {
+            } else if (this.isOutput()) {
                 if (newId.startsWith(this.m.outputPrefix)) {
                     newGraphId = newId.substring(4);
-                }
-                else {
+                } else {
                     newGraphId = newId;
                     newId = this.m.outputPrefix + newId;
                 }
-            }
-            else {
+            } else {
                 newGraphId = newId;
             }
 
@@ -1803,8 +1820,7 @@ class GraphNode {
                                 }
                             });
                         });
-                    }
-                    else if (this.isOutput()) {
+                    } else if (this.isOutput()) {
                         // get inboundLinks of this node that target this input, and detach them
                         _.each(parentNodes, (n) => {
                             _.each(n.getOutboundLinks(), (l) => {
@@ -1847,8 +1863,7 @@ class GraphNode {
             _.each(links2node, (link) => {
                 if (link.sourceId == "input" || link.sourceId == "output") {
                     link.sourceOutput = newId;
-                }
-                else {
+                } else {
                     link.sourceId = newId;
                 }
                 link.attach();
@@ -1911,8 +1926,7 @@ class DataLink {
         if (sourceNode.isInput()) {
             this.sourceId = "input";
             this.sourceOutput = this.m.inputPrefix + sourceNode.graphId;
-        }
-        else if (sourceNode.isOutput()) {
+        } else if (sourceNode.isOutput()) {
             this.sourceId = "output";
             this.sourceOutput = this.m.outputPrefix + sourceNode.graphId;
         }
@@ -1921,8 +1935,7 @@ class DataLink {
         if (targetNode.isInput()) {
             this.targetId = "input";
             this.targetInput = this.m.inputPrefix + targetNode.graphId;
-        }
-        else if (targetNode.isOutput()) {
+        } else if (targetNode.isOutput()) {
             this.targetId = "output";
             this.targetInput = this.m.outputPrefix + targetNode.graphId;
         }
@@ -1932,20 +1945,16 @@ class DataLink {
         if (this.sourceId === "input") {
             if (this.sourceOutput.startsWith(this.m.inputPrefix)) {
                 return this.m.getNode(this.sourceOutput);
-            }
-            else {
+            } else {
                 return this.m.getNode(this.m.inputPrefix + this.sourceOutput);
             }
-        }
-        else if (this.sourceId === "output") {
+        } else if (this.sourceId === "output") {
             if (this.sourceOutput.startsWith(this.m.outputPrefix)) {
                 return this.m.getNode(this.sourceOutput);
-            }
-            else {
+            } else {
                 return this.m.getNode(this.m.outputPrefix + this.sourceOutput);
             }
-        }
-        else {
+        } else {
             return this.m.getNode(this.sourceId);
         }
     }
@@ -1954,20 +1963,16 @@ class DataLink {
         if (this.targetId === "input") {
             if (this.targetInput.startsWith(this.m.inputPrefix)) {
                 return this.m.getNode(this.targetInput);
-            }
-            else {
+            } else {
                 return this.m.getNode(this.m.inputPrefix + this.targetInput);
             }
-        }
-        else if (this.targetId == "output") {
+        } else if (this.targetId == "output") {
             if (this.targetInput.startsWith(this.m.outputPrefix)) {
                 return this.m.getNode(this.targetInput);
-            }
-            else {
+            } else {
                 return this.m.getNode(this.m.outputPrefix + this.targetInput);
             }
-        }
-        else {
+        } else {
             return this.m.getNode(this.targetId);
         }
     }
@@ -1989,8 +1994,7 @@ class DataLink {
             def.graph = def.graph || {};
             def.graph.path = def.graph.path || [];
             def.graph.path.unshift(pos);
-        }
-        else {
+        } else {
             // we need to find pos1 in the array to add pos at the right location
             var index;
             _.each(def.graph.path, (p, i) => {
@@ -2038,11 +2042,9 @@ class DataLink {
         var targetNode = this.getTargetNode();
         if (targetNode.isInput()) {
             return targetNode.def.link;
-        }
-        else if (targetNode.isOutput()) {
+        } else if (targetNode.isOutput()) {
             return targetNode.def.link;
-        }
-        else {
+        } else {
             return targetNode.def.links && targetNode.def.links[this.targetInput] || {};
         }
     }
@@ -2055,11 +2057,9 @@ class DataLink {
         var targetNode = this.getTargetNode();
         if (targetNode.isInput()) {
             targetNode.def.link = def;
-        }
-        else if (targetNode.isOutput()) {
+        } else if (targetNode.isOutput()) {
             targetNode.def.link = def;
-        }
-        else {
+        } else {
             targetNode.def.links = targetNode.def.links || {};
             targetNode.def.links[this.targetInput] = def;
         }
@@ -2077,12 +2077,14 @@ class DataLink {
         // build the connection object
         var sourceNode = this.getSourceNode();
         if (sourceNode.isInput()) {
-            var connection = { "input": sourceNode.graphId }
-        }
-        else if (sourceNode.isOutput()) {
-            var connection = { "output": sourceNode.graphId }
-        }
-        else {
+            var connection = {
+                "input": sourceNode.graphId
+            }
+        } else if (sourceNode.isOutput()) {
+            var connection = {
+                "output": sourceNode.graphId
+            }
+        } else {
             var connection = {};
             connection[sourceNode.graphId] = this.sourceOutput;
         }
@@ -2097,7 +2099,7 @@ class DataLink {
             var l = new DataLink(this.m, key, val, this.targetId, this.targetInput);
             if (!this.equals(l)) {
                 throw "Can not add link " + this.sourceId + ":" + this.sourceOutput + " -> " +
-                this.targetId + ":" + this.targetInput + " : a link already exist to target input";
+                    this.targetId + ":" + this.targetInput + " : a link already exist to target input";
             }
         }
 
@@ -2109,8 +2111,7 @@ class DataLink {
         var targetNode = this.getTargetNode();
         if (targetNode.isInput() || targetNode.isOutput()) {
             delete targetNode.def.link;
-        }
-        else {
+        } else {
             delete targetNode.def.links[this.targetInput];
         }
     }
@@ -2162,8 +2163,7 @@ class EventLink {
 
         if (index) {
             n.def.events[index] = def;
-        }
-        else {
+        } else {
             n.def.events.push(def);
         }
     }
@@ -2198,8 +2198,7 @@ class EventLink {
             def.graph = def.graph || {};
             def.graph.path = def.graph.path || [];
             def.graph.path.unshift(pos);
-        }
-        else {
+        } else {
             // we need to find pos1 in the array to add pos at the right location
             var index;
             _.each(def.graph.path, (p, i) => {
@@ -2332,7 +2331,10 @@ class Application {
     addSubEvent(name, nodeName, evtName) {
         var inputEvents = _.get(this.json.events, [name, "in"]);
         if (!inputEvents) inputEvents = [];
-        inputEvents.push({ "node": nodeName, "event": evtName });
+        inputEvents.push({
+            "node": nodeName,
+            "event": evtName
+        });
     }
 
     addCallback(name) {
@@ -2348,9 +2350,10 @@ class Application {
     }
 
     addAppEvent(name) {
-        this.json.events[name] = { "in": [] };
+        this.json.events[name] = {
+            "in": []
+        };
     }
 }
 
-export default GraphModel;
-
+export default GraphModel;