fix: allow projects to export

Author: faretek1

scratchattach/editor/__init__.py

@@ -3,6 +3,7 @@
 """
 
 from .asset import Asset, Costume, Sound
+from .blockshape import BlockShapes
 from .project import Project
 from .extension import Extensions, Extension
 from .mutation import Mutation, Argument, ArgumentType, parse_proc_code, construct_proccode, ArgTypes

scratchattach/editor/block.py

@@ -152,17 +152,17 @@ def id(self) -> str:
         Work out the id of this block by searching through the sprite dictionary
         """
         if self._id:
-            return self.id
+            return self._id
         # warnings.warn(f"Using block IDs can cause consistency issues and is not recommended")
         # This property is used when converting comments to JSON (we don't want random warning when exporting a project)
         for _block_id, _block in self.sprite.blocks.items():
             if _block is self:
                 self._id = _block_id
-                return self.id
+                return self._id
 
         # Let's just automatically assign ourselves an id
         self.sprite.add_block(self)
-        return self.id
+        return self._id
 
     @id.setter
     def id(self, value: str) -> None:

scratchattach/editor/monitor.py

@@ -3,11 +3,12 @@
 from typing import Optional, TYPE_CHECKING
 
 from typing_extensions import deprecated
+import warnings
 
 if TYPE_CHECKING:
     from . import project
 
-from . import base
+from . import base, block
 
 
 class Monitor(base.ProjectSubcomponent):
@@ -33,6 +34,9 @@ def __init__(self, reporter: Optional[base.NamedIDComponent] = None,
         """
         assert isinstance(reporter, base.SpriteSubComponent) or reporter is None
 
+        if sprite_name is None and hasattr(reporter, 'sprite'):
+            sprite_name = None if reporter.sprite.is_stage else reporter.sprite.name
+
         self.reporter_id = reporter_id
         """
         ID referencing the VLB being referenced. Replaced with None during project instantiation, where the reporter attribute is updated
@@ -142,14 +146,14 @@ def link_using_project(self):
     # todo: consider reimplementing this
     @deprecated("This method does not work correctly (This may be fixed in the future)")
     @staticmethod
-    def from_reporter(reporter: Block, _id: str = None, mode: str = "default",
+    def from_reporter(reporter: block.Block, _id: str = None, mode: str = "default",
                       opcode: str = None, sprite_name: str = None, value=0, width: int | float = 0,
                       height: int | float = 0,
                       x: int | float = 5, y: int | float = 5, visible: bool = False, slider_min: int | float = 0,
                       slider_max: int | float = 100, is_discrete: bool = True, params: dict = None):
-        if "reporter" not in reporter.stack_type:
+        if not reporter.block_shape.is_reporter:
             warnings.warn(f"{reporter} is not a reporter block; the monitor will return '0'")
-        elif "(menu)" in reporter.stack_type:
+        elif reporter.block_shape.is_menu:
             warnings.warn(f"{reporter} is a menu block; the monitor will return '0'")
         # Maybe add note that length of list doesn't work fsr?? idk
         if _id is None:
@@ -166,7 +170,7 @@ def from_reporter(reporter: Block, _id: str = None, mode: str = "default",
                 params[field.id] = field.value, field.value_id
 
         return Monitor(
-            _id,
+            reporter,
             mode,
             opcode,
 

scratchattach/editor/project.py

@@ -31,7 +31,7 @@ def __init__(self, _name: Optional[str] = None, _meta: Optional[meta.Meta] = Non
         self.name = _name
 
         self.meta = _meta
-        self.extensions = _extensions
+        self.extensions: list[extension.Extension] = list(_extensions)
         self.monitors = list(_monitors)
         self.sprites = list(_sprites)
 
@@ -69,11 +69,12 @@ def __repr__(self):
         return _ret
 
     @property
-    def stage(self) -> sprite.Sprite:
+    def stage(self) -> Optional[sprite.Sprite]:
         for _sprite in self.sprites:
             if _sprite.is_stage:
                 return _sprite
         warnings.warn(f"Could not find stage for {self.name}")
+        return None
 
     def to_json(self) -> dict:
         _json = {
@@ -221,19 +222,23 @@ def from_id(project_id: int, _name: Optional[str] = None):
         return _proj
 
     def find_vlb(self, value: str | None, by: str = "name",
-                 multiple: bool = False) -> vlb.Variable | vlb.List | vlb.Broadcast | list[
-        vlb.Variable | vlb.List | vlb.Broadcast]:
-        _ret = []
+                 multiple: bool = False) -> Optional[vlb.Variable | vlb.List | vlb.Broadcast | list[
+        vlb.Variable | vlb.List | vlb.Broadcast]]:
+
+        _ret: list[vlb.Variable | vlb.List | vlb.Broadcast] = []
         for _sprite in self.sprites:
             val = _sprite.find_vlb(value, by, multiple)
             if multiple:
                 _ret += val
             else:
                 if val is not None:
                     return val
+
         if multiple:
             return _ret
 
+        return None
+
     def find_sprite(self, value: str | None, by: str = "name",
                  multiple: bool = False) -> sprite.Sprite | list[sprite.Sprite]:
         _ret = []

scratchattach/editor/sprite.py

@@ -102,6 +102,11 @@ def link_subcomponents(self):
         self.link_prims()
         self.link_blocks()
         self.link_comments()
+        self.link_vlbs()
+
+    def link_vlbs(self):
+        for _vlb in self.vlbs:
+            _vlb.sprite = self
 
     def link_prims(self):
         """