WIP

(╯°□°)╯︵ ┻━┻

Author: dylanmccall

addons/block_code/blocks/graphics/animationplayer_play.gd

@@ -1,7 +1,8 @@
 @tool
-
 extends EBC_BlockExtension
 
+const OptionData = preload("res://addons/block_code/code_generation/option_data.gd")
+
 
 func get_defaults_for_node(defaults: Dictionary, context_node: Node) -> Dictionary:
 	var animation_player = context_node as AnimationPlayer

addons/block_code/blocks/graphics/animationplayer_play.tres

@@ -4,15 +4,15 @@
 [ext_resource type="Script" path="res://addons/block_code/code_generation/option_data.gd" id="1_xu43h"]
 [ext_resource type="Script" path="res://addons/block_code/blocks/graphics/animationplayer_play.gd" id="2_7ymgi"]
 
-[sub_resource type="Resource" id="Resource_vnp2w"]
+[sub_resource type="Resource" id="Resource_qpxn2"]
 script = ExtResource("1_xu43h")
 selected = 0
-items = ["ahead", "backwards"]
+items = []
 
-[sub_resource type="Resource" id="Resource_qpxn2"]
+[sub_resource type="Resource" id="Resource_vnp2w"]
 script = ExtResource("1_xu43h")
 selected = 0
-items = []
+items = ["ahead", "backwards"]
 
 [resource]
 script = ExtResource("1_emeuv")

addons/block_code/code_generation/block_definition.gd

@@ -4,6 +4,8 @@ extends Resource
 
 const Types = preload("res://addons/block_code/types/types.gd")
 
+const FORMAT_STRING_PATTERN = "\\[(?<out_parameter>[^\\]]+)\\]|\\{(?<in_parameter>[^}]+)\\}|(?<label>[^\\{\\[]+)"
+
 @export var name: StringName
 
 ## The target node. Leaving this empty the block is considered a general block
@@ -29,6 +31,8 @@ const Types = preload("res://addons/block_code/types/types.gd")
 
 @export var extension_script: GDScript
 
+static var _display_template_regex := RegEx.create_from_string(FORMAT_STRING_PATTERN)
+
 var _extension: EBC_BlockExtension:
 	get:
 		if _extension == null and extension_script and extension_script.can_instantiate():
@@ -76,3 +80,58 @@ func get_defaults_for_node(context_node: Node) -> Dictionary:
 
 func _to_string():
 	return "%s - %s" % [name, target_node_class]
+
+
+func get_output_parameters() -> Dictionary:
+	var result: Dictionary
+	for item in parse_display_template(display_template):
+		if item.has("out_parameter"):
+			var parameter = item.get("out_parameter")
+			result[parameter["name"]] = parameter["type"]
+	return result
+
+
+static func parse_display_template(template_string: String):
+	var items: Array[Dictionary]
+	for regex_match in _display_template_regex.search_all(template_string):
+		if regex_match.names.has("label"):
+			var label_string := regex_match.get_string("label")
+			items.append({
+				"label": label_string
+			})
+		elif regex_match.names.has("in_parameter"):
+			var parameter_string := regex_match.get_string("in_parameter")
+			items.append({
+				"in_parameter": _parse_parameter_format(parameter_string)
+			})
+		elif regex_match.names.has("out_parameter"):
+			var parameter_string := regex_match.get_string("out_parameter")
+			items.append({
+				"out_parameter": _parse_parameter_format(parameter_string)
+			})
+	return items
+
+
+static func _parse_parameter_format(parameter_format: String) -> Dictionary:
+	var parameter_name: String
+	var parameter_type_str: String
+	var parameter_type: Variant.Type
+	var split := parameter_format.split(":", true, 1)
+
+	if len(split) == 0:
+		return {}
+
+	if len(split) > 0:
+		parameter_name = split[0].strip_edges()
+
+	if len(split) > 1:
+		parameter_type_str = split[1].strip_edges()
+
+	if parameter_type_str:
+		parameter_type = Types.STRING_TO_VARIANT_TYPE[parameter_type_str]
+
+	return {"name": parameter_name, "type": parameter_type}
+
+
+static func has_category(block_definition, category: String) -> bool:
+	return block_definition.category == category

addons/block_code/code_generation/blocks_catalog.gd

@@ -240,7 +240,7 @@ static func _setup_input_block():
 			"Input",
 			Types.BlockType.VALUE,
 			TYPE_BOOL,
-			"Is action {action_name: OPTION} {action: OPTION}",
+			"Is action {action_name: NIL} {action: NIL}",
 			'Input.is_action_{action}("{action_name}")',
 			{"action_name": OptionData.new(inputmap_actions), "action": OptionData.new(["pressed", "just_pressed", "just_released"])},
 		)

addons/block_code/drag_manager/drag_manager.gd

@@ -64,7 +64,7 @@ func drag_block(block: Block, copied_from: Block = null):
 
 
 func copy_block(block: Block) -> Block:
-	var new_block = Util.instantiate_block(block.definition)
+	var new_block = block.block_factory.instantiate_block(block.definition)
 	new_block.color = block.color
 	return new_block
 

addons/block_code/serialization/block_script_serialization.gd

@@ -4,7 +4,6 @@ extends Resource
 
 const ASTList = preload("res://addons/block_code/code_generation/ast_list.gd")
 const BlockAST = preload("res://addons/block_code/code_generation/block_ast.gd")
-const BlocksCatalog = preload("res://addons/block_code/code_generation/blocks_catalog.gd")
 const BlockCategory = preload("res://addons/block_code/ui/picker/categories/block_category.gd")
 const BlockDefinition = preload("res://addons/block_code/code_generation/block_definition.gd")
 const BlockSerialization = preload("res://addons/block_code/serialization/block_serialization.gd")
@@ -34,31 +33,27 @@ func _init(
 
 func _set_variables(value):
 	variables = value
-	_refresh_var_block_definitions()
+	#_refresh_var_block_definitions()
 
 
-func _refresh_var_block_definitions():
-	_var_block_definitions.clear()
-	for block_def in BlocksCatalog.get_variable_block_definitions(variables):
-		_var_block_definitions[block_def.name] = block_def
+#func _refresh_var_block_definitions():
+	#_var_block_definitions.clear()
+	#for block_def in BlocksCatalog.get_variable_block_definitions(variables):
+		#_var_block_definitions[block_def.name] = block_def
 
 
-func _get_block(block_name: StringName) -> BlockDefinition:
-	var block_def: BlockDefinition = _var_block_definitions.get(block_name)
-	if block_def == null:
-		block_def = BlocksCatalog.get_block(block_name)
-	return block_def
+#func _get_block(block_name: StringName) -> BlockDefinition:
+	#var block_def: BlockDefinition = _var_block_definitions.get(block_name)
+	#if block_def == null:
+		#block_def = BlocksCatalog.get_block(block_name)
+	#return block_def
 
 
-func get_definitions() -> Array[BlockDefinition]:
+func load_object_script() -> GDScript:
 	for class_dict in ProjectSettings.get_global_class_list():
 		if class_dict.class == script_inherits:
-			var script = load(class_dict.path)
-			if script.has_method("setup_custom_blocks"):
-				script.setup_custom_blocks()
-			break
-
-	return BlocksCatalog.get_inherited_blocks(script_inherits)
+			return load(class_dict.path)
+	return null
 
 
 func get_categories() -> Array[BlockCategory]:
@@ -87,7 +82,7 @@ func _tree_to_ast(tree: BlockSerializationTree) -> BlockAST:
 
 func _block_to_ast_node(node: BlockSerialization) -> BlockAST.ASTNode:
 	var ast_node := BlockAST.ASTNode.new()
-	ast_node.data = _get_block(node.name)
+	ast_node.data = node.name
 
 	for arg_name in node.arguments:
 		var argument = node.arguments[arg_name]
@@ -105,7 +100,7 @@ func _block_to_ast_node(node: BlockSerialization) -> BlockAST.ASTNode:
 
 func _value_to_ast_value(value_node: ValueBlockSerialization) -> BlockAST.ASTValueNode:
 	var ast_value_node := BlockAST.ASTValueNode.new()
-	ast_value_node.data = _get_block(value_node.name)
+	ast_value_node.data = value_node.name
 
 	for arg_name in value_node.arguments:
 		var argument = value_node.arguments[arg_name]
@@ -126,7 +121,7 @@ func update_from_ast_list(ast_list: ASTList):
 
 
 func _block_from_ast_node(ast_node: BlockAST.ASTNode) -> BlockSerialization:
-	var block := BlockSerialization.new(ast_node.data.name)
+	var block := BlockSerialization.new(ast_node.data)
 
 	for arg_name in ast_node.arguments:
 		var argument = ast_node.arguments[arg_name]
@@ -143,7 +138,7 @@ func _block_from_ast_node(ast_node: BlockAST.ASTNode) -> BlockSerialization:
 
 
 func _value_from_ast_value(ast_node: BlockAST.ASTValueNode) -> ValueBlockSerialization:
-	var value := ValueBlockSerialization.new(ast_node.data.name)
+	var value := ValueBlockSerialization.new(ast_node.data)
 
 	for arg_name in ast_node.arguments:
 		var argument = ast_node.arguments[arg_name]

addons/block_code/simple_nodes/simple_character/simple_character.gd

@@ -129,7 +129,7 @@ static func setup_custom_blocks():
 	block_definition.target_node_class = _class_name
 	block_definition.category = "Input"
 	block_definition.type = Types.BlockType.STATEMENT
-	block_definition.display_template = "Move with {player: OPTION} buttons as {kind: OPTION}"
+	block_definition.display_template = "Move with {player: NIL} buttons as {kind: NIL}"
 	# TODO: delta here is assumed to be the parameter name of
 	# the _process or _physics_process method:
 	block_definition.code_template = 'move_with_player_buttons("{player}", "{kind}", delta)'