Implement changes from engine-php

Author: StefansArya

Blackprint/Constructor/Port.py

@@ -155,11 +155,11 @@ def _callAll(this):
 
 	def createLinker(this):
 		# Callable port
-		if(this.source == 'output' and (this.type == FunctionType or this.type == Types.Route)):
+		if(this.source == 'output' and (this.type == Types.Trigger or this.type == Types.Route)):
 			# Disable sync
 			this._sync = False
 
-			if(this.type != FunctionType):
+			if(this.type != Types.Trigger):
 				this.isRoute = True
 				this.iface.node.routes.disableOut = True
 
@@ -305,7 +305,7 @@ def assignType(this, type_):
 				if(type_['feature'] == PortFeature.Union):
 					type_ = Types.Any
 				elif(type_['feature'] == PortFeature.Trigger):
-					type_ = FunctionType
+					type_ = type_['type']
 				elif(type_['feature'] == PortFeature.ArrayOf):
 					type_ = list
 				elif(type_['feature'] == PortFeature.Default):
@@ -403,8 +403,8 @@ def connectCable(this, cable: Cable):
 
 		# Remove cable if type restriction
 		if(not isInstance or (
-			   cableOwner.type == FunctionType and this.type != FunctionType
-			or cableOwner.type != FunctionType and this.type == FunctionType
+			   cableOwner.type == Types.Trigger and this.type != Types.Trigger
+			or cableOwner.type != Types.Trigger and this.type == Types.Trigger
 		)):
 			this._cableConnectError('cable.wrong_type_pair', {
 				"cable": cable,
@@ -456,7 +456,7 @@ def connectCable(this, cable: Cable):
 			out = cable.target
 
 		# Remove old cable if the port not support array
-		if(inp.feature != PortFeature.ArrayOf and inp.type != FunctionType):
+		if(inp.feature != PortFeature.ArrayOf and inp.type != Types.Trigger):
 			cables = inp.cables # Cables in input port
 			cableLen = len(cables)
 

Blackprint/Constructor/PortLink.py

@@ -1,6 +1,5 @@
 import re
 
-from types import FunctionType
 from typing import Dict
 
 from ..Internal import EvPortSelf
@@ -127,7 +126,7 @@ def __getitem__(this, key):
 		# else: output ports
 
 		# This may get called if the port is lazily assigned with Slot port feature
-		if(port.type == FunctionType):
+		if(port.type == Types.Trigger):
 			if(port._call_ == None):
 				port._call_ = lambda: port._callAll()
 
@@ -199,7 +198,7 @@ def _add(this, portName, val):
 			if(val['feature'] == Port.Union):
 				val = Types.Any
 			elif(val['feature'] == Port.Trigger):
-				val = FunctionType
+				val = Types.Trigger
 			elif(val['feature'] == Port.ArrayOf):
 				val = list
 			elif(val['feature'] == Port.Default):

Blackprint/Engine.py

@@ -308,6 +308,11 @@ def settings(this, which, val):
 		which = which.replace('.', '_')
 		this.settings[which] = val
 
+	def linkVariables(this, vars):
+		for temp in vars:
+			Utils.setDeepProperty(this.variables, temp.id.split('/'), temp)
+			this._emit('variable.new', temp)
+
 	def _getTargetPortType(this, instance, whichPort, targetNodes):
 		target = targetNodes[0] # ToDo: check all target in case if it's supporting Union type
 		targetIface = instance.ifaceList[target['i']]
@@ -419,6 +424,8 @@ def createVariable(this, id, options):
 		parentObj = Utils.getDeepProperty(this.variables, ids, 1)
 
 		if(parentObj != None and lastId in parentObj):
+			if(parentObj[lastId].isShared): return
+      
 			this.variables[id].destroy()
 			del this.variables[id]
 

Blackprint/Internal.py

@@ -2,6 +2,7 @@
 # from .Utils import Utils
 from .Constructor import InstanceEvent
 from .Types import Types
+from .Nodes.BPVariable_init import BPVariable, VarScope
 
 class Internal:
 	nodes = {}
@@ -66,6 +67,16 @@ def registerEvent(namespace, options):
 
 	Internal.events[namespace] = InstanceEvent(options)
 
+def createVariable(namespace, options=[]):
+	if(re.search(r'/\s/', namespace) != None):
+		raise Exception(f"Namespace can't have space character: '{namespace}'")
+
+	temp = BPVariable(namespace, options)
+	temp._scope = VarScope.public
+	temp.isShared = True
+
+	return temp
+
 # Below is for internal only
 class EvError:
 	def __init__(this, type, data):

Blackprint/Nodes/BPEvent.py

@@ -1,5 +1,4 @@
 from ..Types import Types
-from types import FunctionType
 from typing import Dict
 
 from ..Port.PortFeature import Port

Blackprint/Nodes/BPFunction.py

@@ -1,6 +1,5 @@
 import re
 
-from types import FunctionType
 from typing import Dict
 
 from ..Port.PortFeature import Port
@@ -10,6 +9,7 @@
 from ..Constructor.CustomEvent import CustomEvent
 from ..Constructor.Port import Port as PortClass
 from .BPVariable import VarScope, BPVariable
+from ..Types import Types
 from .Enums import Enums
 from ..Internal import EvVariableNew, registerNode, registerInterface
 import re
@@ -276,7 +276,7 @@ def update(this, cable):
 
 			# Sync all port value
 			for key, value in IOutput.items():
-				if(value.type == FunctionType): continue
+				if(value.type == Types.Trigger): continue
 				Output[key] = thisInput[key]
 
 			return
@@ -348,7 +348,7 @@ def update(this, cable):
 
 			# Sync all port value
 			for key, value in IOutput.items():
-				if(value.type == FunctionType): continue
+				if(value.type == Types.Trigger): continue
 				Output[key] = thisInput[key]
 
 			return
@@ -379,6 +379,8 @@ def _BpFnInit(this):
 		# ToDo: will this be slower if we lazy import the module like below?
 		from ..Engine import Engine
 		this.bpInstance = Engine()
+		if(this.data != None and ('pause' in this.data)):
+			this.bpInstance.executionOrder.pause = True
 
 		bpFunction = node._funcInstance
 
@@ -421,6 +423,7 @@ def _save(ev, eventName, force=False):
 		this._save = _save
 		this.bpInstance.on('cable.connect cable.disconnect node.created node.delete node.id.changed port.default.changed _port.split _port.unsplit _port.resync.allow _port.resync.disallow', this._save)
 
+	def imported(this, data): this.data = data
 	def renamePort(this, which, fromName, toName):
 		this.node._funcInstance.renamePort(which, fromName, toName)
 		this._save(False, False, True)
@@ -461,7 +464,7 @@ def addPort(this, port: PortClass, customName):
 			nodeB = this.node
 			refName = PortName(name)
 
-			portType = getFnPortType(port, 'input', this._funcMain, refName)
+			portType = getFnPortType(port, 'input', this, refName)
 			nodeA._funcInstance.input[name] = portType
 
 		else: # Output (input) . Main (output)
@@ -476,12 +479,12 @@ def addPort(this, port: PortClass, customName):
 			nodeB = this._funcMain.node
 			refName = PortName(name)
 
-			portType = getFnPortType(port, 'output', this._funcMain, refName)
+			portType = getFnPortType(port, 'output', this, refName)
 			nodeB._funcInstance.output[name] = portType
 
 		outputPort = nodeB.createPort('output', name, portType)
 
-		if(portType == FunctionType):
+		if(portType == Types.Trigger):
 			inputPort = nodeA.createPort('input', name, Port.Trigger(lambda port: outputPort._callAll()))
 		else: inputPort = nodeA.createPort('input', name, portType)
 

Blackprint/Nodes/BPVariable.py

@@ -1,24 +1,16 @@
-from types import FunctionType
 from ..Node import Node
 from ..Interface import Interface
 from ..Nodes.Enums import Enums
-from ..Constructor.CustomEvent import CustomEvent
 from ..Constructor.Port import Port as PortClass
 from ..Utils import Utils
 from ..Internal import registerNode, registerInterface
 from ..Types import Types
 from ..Port.PortFeature import Port
-import re
+from .BPVariable_init import BPVariable, VarScope
 
 # Don't delete even unused, this is needed for importing the internal node
 from .Environments import BPEnvGet
 
-# For internal library use only
-class VarScope:
-	public = 0
-	private = 1
-	shared = 2
-
 @registerNode('BP/Var/Set')
 class VarSet(Node):
 	input = {}
@@ -62,46 +54,6 @@ def __init__(this, instance):
 
 	def destroy(this): this.iface.destroyIface()
 
-# used for instance.createVariable
-class BPVariable(CustomEvent):
-	type = None
-	# this.totalSet = 0
-	# this.totalGet = 0
-
-	def __init__(this, id, options={}):
-		CustomEvent.__init__(this)
-
-		id = re.sub(r'/^\/|\/$/m', '', id)
-		id = re.sub(r'/[`~!@#$%^&*()\-_+={}\[\]:"|;\'\\\\,.<>?]+/', '_', id)
-		this.id = id
-		this.title = options['title'] if 'title' in options else id
-
-		# this.rootInstance = instance
-		this.id = this.title = id
-		this.type = Types.Slot
-		this._value = None
-		this.used = []
-
-		# The type need to be defined dynamically on first cable connect
-
-	@property
-	def value(this):
-		return this._value
-
-	@value.setter
-	def value(this, val):
-		if(this._value == val): return
-
-		this._value = val
-		this.emit('value')
-
-	def destroy(this):
-		map = this.used
-		for iface in map:
-			iface.node.instance.deleteNode(iface)
-
-		map.clear()
-
 class BPVarGetSet(Interface):
 	_onChanged = None
 	_dynamicPort = True # Port is initialized dynamically
@@ -158,10 +110,14 @@ def useType(this, port: PortClass):
 
 		if(port == None): raise Exception("Can't set type with None")
 		temp.type = port._config if port._config != None else port.type
+		if(isinstance(temp, dict) and temp.type['feature'] == Port.Trigger):
+			temp.type = Types.Trigger
 
 		if(port.type == Types.Slot):
 			this.waitTypeChange(temp, port)
-		else: temp.emit('type.assigned')
+		else:
+			this._recheckRoute()
+			temp.emit('type.assigned')
 
 		# Also create port for other node that using this variable
 		used = temp.used
@@ -172,19 +128,34 @@ def waitTypeChange(this, bpVar, port=None):
 		def callback():
 			if(port != None):
 				bpVar.type = port._config if port._config != None else port.type
+				if(isinstance(bpVar, dict) and bpVar.type['feature'] == Port.Trigger):
+					bpVar.type = Types.Trigger
+
 				bpVar.emit('type.assigned')
 			else:
 				if this.input['Val'] != None:
 					target = this.input['Val']
 				else: target = this.output['Val']
 				target.assignType(bpVar.type)
 
+			this._recheckRoute()
+
 		this._waitTypeChange = callback
 		this._destroyWaitType = lambda: bpVar.off('type.assigned', this._waitTypeChange)
 
 		iPort = port if port != None else bpVar
 		iPort.once('type.assigned', this._waitTypeChange)
 
+	def _recheckRoute(this):
+		if(
+			(hasattr(this, 'input') and ('Val' in this.input) and this.input['Val'].type == Types.Trigger)
+     		or
+			(hasattr(this, 'output') and ('Val' in this.output) and this.output['Val'].type == Types.Trigger)
+		):
+			routes = this.node.routes
+			routes.disableOut = True
+			routes.noUpdate = True
+
 	def destroyIface(this):
 		temp = this._destroyWaitType
 		if(temp != None):
@@ -220,6 +191,7 @@ def changeVar(this, name, scopeId):
 		if(varRef.type == Types.Slot): return
 
 		this._reinitPort()
+		this._recheckRoute()
 
 	def _reinitPort(this):
 		temp = this._bpVarRef
@@ -234,7 +206,7 @@ def _reinitPort(this):
 		ref = node.output
 		node.createPort('output', 'Val', temp.type)
 
-		if(temp.type == FunctionType):
+		if(temp.type == Types.Trigger):
 			this._eventListen = 'call'
 			def callback(ev): ref['Val']()
 			this._onChanged = callback
@@ -243,7 +215,7 @@ def callback(ev): ref['Val']()
 			def callback(ev): ref['Val'] = temp._value
 			this._onChanged = callback
 
-		if(temp.type != FunctionType):
+		if(temp.type != Types.Trigger):
 			node.output['Val'] = temp._value
 
 		temp.on(this._eventListen, this._onChanged)
@@ -265,6 +237,7 @@ def changeVar(this, name, scopeId):
 		if(varRef.type == Types.Slot): return
 
 		this._reinitPort()
+		this._recheckRoute()
 
 	def _reinitPort(this):
 		input = this.input
@@ -277,7 +250,7 @@ def _reinitPort(this):
 		if('Val' in input):
 			node.deletePort('input', 'Val')
 
-		if(temp.type == FunctionType):
+		if(temp.type == Types.Trigger):
 			node.createPort('input', 'Val', Port.Trigger(lambda port: temp.emit('call')))
 
 		else: node.createPort('input', 'Val', temp.type)