Use default output value if exist

Author: StefansArya

src/constructor/Cable.js

@@ -23,7 +23,9 @@ class Cable{
 			this.visualizeFlow();
 
 		if(this._disconnecting) return this.input.default;
-		return this.output.value;
+
+		let temp = this.output;
+		return temp.value ?? temp.default;
 	}
 
 	activation(enable){
@@ -124,12 +126,12 @@ class Cable{
 		inp.emit('connect', temp);
 		out.emit('connect', {port: out, target: inp, cable: this});
 
-		if(out.value !== void 0){
+		if(out.value != null || out.default != null){
 			inp.emit('value', temp);
 			inp.iface.emit('port.value', temp);
 
 			let node = inp.iface.node;
-			if(node.update !== void 0) {
+			if(node.update != null) {
 				if(node.instance._importing)
 					node.instance.executionOrder.add(node, this);
 				else if(node.routes.in.length === 0) {

src/constructor/Port.js

@@ -150,9 +150,7 @@ Blackprint.Engine.Port = class Port extends Blackprint.Engine.CustomEvent{
 				// This port must use values from connected output
 				if(port.source === 'input'){
 					if(port._cache !== void 0) return port._cache;
-
-					if(port.cables.length === 0)
-						return port.default;
+					if(port.cables.length === 0) return port.default;
 
 					let portIface = port.iface;
 
@@ -190,22 +188,17 @@ Blackprint.Engine.Port = class Port extends Blackprint.Engine.CustomEvent{
 							cable.visualizeFlow();
 
 						portIface._requesting = false;
-						if(port.feature === BP_Port.ArrayOf){
-							port._cache = [];
-							if(output.value != null)
-								port._cache.push(output.value);
-
-							return port._cache;
-						}
+						if(port.feature === BP_Port.ArrayOf)
+							return port._cache = [output.value ?? output.default];
 
-						return port._cache = output.value ?? port.default;
+						return port._cache = output.value ?? port.default ?? output.default;
 					}
 
 					let isNotArrayPort = port.feature !== BP_Port.ArrayOf;
 
 					// Return multiple data as an array
 					var cables = port.cables;
-					var data = [];
+					var data = new Array(cables.length);
 					for (var i = 0; i < cables.length; i++) {
 						var cable = cables[i];
 						if(cable.connected === false || cable.disabled)
@@ -229,12 +222,13 @@ Blackprint.Engine.Port = class Port extends Blackprint.Engine.CustomEvent{
 						if(Blackprint.settings.visualizeFlow)
 							cable.visualizeFlow();
 
+						let gotData = output.value ?? port.default ?? output.default;
 						if(isNotArrayPort){
 							portIface._requesting = false;
-							return port._cache = output.value ?? port.default;
+							return port._cache = gotData;
 						}
 
-						data.push(output.value);
+						data[i] = gotData;
 					}
 
 					portIface._requesting = false;
@@ -246,7 +240,7 @@ Blackprint.Engine.Port = class Port extends Blackprint.Engine.CustomEvent{
 					return port.__call ??= () => port._callAll();
 
 				// else type: output port, let's just return the value
-				return port.value;
+				return port.value ?? port.default;
 			}
 		};
 

src/nodes/Fn.js

@@ -755,7 +755,8 @@ function BPFnInit(){
 			this.emit(`_add.${name}`, {port: inputPort});
 
 			inputPort.on('value', ({ cable }) => {
-				outputPort.iface.node.output[outputPort.name] = cable.output.value;
+				let temp = cable.output;
+				outputPort.iface.node.output[outputPort.name] = temp.value ?? temp.default;
 			});
 
 			return inputPort;

src/nodes/FnPortVar.js

@@ -162,7 +162,7 @@ function BPFnVarInit(){
 				this._listener = ({ port }) => {
 					if(port.iface.node.routes.out != null){
 						let { Val } = this.ref.IOutput;
-						Val.value = port.value; // Change value without trigger node.update
+						Val.value = port.value ?? port.default; // Change value without trigger node.update
 
 						let list = Val.cables;
 						for (let i=0; i < list.length; i++) {
@@ -175,7 +175,7 @@ function BPFnVarInit(){
 						return;
 					}
 
-					this.ref.Output.Val = port.value;
+					this.ref.Output.Val = port.value ?? port.default;
 				};
 
 				port.on('value', this._listener);