ScriptBuilder: Add addEntityField() method

Author: adazem009

include/scratchcpp/dev/test/scriptbuilder.h

@@ -13,6 +13,7 @@ namespace libscratchcpp
 class IExtension;
 class IEngine;
 class Target;
+class Entity;
 class List;
 
 } // namespace libscratchcpp
@@ -44,6 +45,8 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         void addDropdownInput(const std::string &name, const std::string &selectedValue);
         void addDropdownField(const std::string &name, const std::string &selectedValue);
 
+        void addEntityField(const std::string &name, std::shared_ptr<Entity> entity);
+
         std::shared_ptr<Block> currentBlock();
 
         void build();

src/dev/test/scriptbuilder.cpp

@@ -152,6 +152,17 @@ void ScriptBuilder::addDropdownField(const std::string &name, const std::string
     impl->lastBlock->addField(field);
 }
 
+/*! Adds a field pointing to an entity (variable, list, broadcast, etc.) */
+void ScriptBuilder::addEntityField(const std::string &name, std::shared_ptr<Entity> entity)
+{
+    if (!impl->lastBlock)
+        return;
+
+    entity->setId(std::to_string(impl->blockId++));
+    auto field = std::make_shared<Field>(name, Value(), entity);
+    impl->lastBlock->addField(field);
+}
+
 /*!
  * Returns the current block (can be used e. g. with a custom Compiler instance).\n
  * The script is automatically built to set the compile function of the block.
@@ -199,8 +210,6 @@ void ScriptBuilder::addBlock(std::shared_ptr<Block> block)
 
 void ScriptBuilder::build(std::shared_ptr<Target> target)
 {
-    impl->engine->clear();
-
     if (target->blocks().empty()) {
         for (auto block : impl->blocks)
             target->addBlock(block);

test/dev/test_api/scriptbuilder_test.cpp

@@ -7,6 +7,7 @@
 #include <scratchcpp/input.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/list.h>
+#include <scratchcpp/broadcast.h>
 
 #include "../../common.h"
 #include "testextension.h"
@@ -161,6 +162,22 @@ TEST_F(ScriptBuilderTest, AddDropdownField)
     ASSERT_EQ(testing::internal::GetCapturedStdout(), "hello\n");
 }
 
+TEST_F(ScriptBuilderTest, AddEntityField)
+{
+    auto broadcast = std::make_shared<Broadcast>("", "");
+    m_engine->setBroadcasts({ broadcast });
+
+    m_builder->addBlock("test_print_field");
+    m_builder->addEntityField("STRING", broadcast);
+    auto block = m_builder->currentBlock();
+    ASSERT_TRUE(block);
+    ASSERT_EQ(block->opcode(), "test_print_field");
+    ASSERT_TRUE(block->inputs().empty());
+    ASSERT_EQ(block->fields().size(), 1);
+    ASSERT_EQ(block->fieldAt(0)->name(), "STRING");
+    ASSERT_EQ(block->fieldAt(0)->valuePtr(), broadcast);
+}
+
 TEST_F(ScriptBuilderTest, ReporterBlocks)
 {
     m_builder->addReporterBlock("test_teststr");