typescratch 1.6.0__tar.gz → 1.6.2__tar.gz

{typescratch-1.6.0 → typescratch-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typescratch
-Version: 1.6.0
+Version: 1.6.2
 Summary: A programming language that compiles to Scratch 3 (.sb3) files
 Author: TypeScratch
 License: Apache-2.0

{typescratch-1.6.0 → typescratch-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "typescratch"
-version = "1.6.0"
+version = "1.6.2"
 description = "A programming language that compiles to Scratch 3 (.sb3) files"
 readme = "README.md"
 requires-python = ">=3.8"

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch/__init__.py

@@ -46,7 +46,7 @@ from .codegen import Codegen
 from .sb3 import write_sb3, write_sb3_bytes
 
 
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 
 
 def compile_source(src: str, filename: str = "<tysh>", debug: bool = False,

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch/blocks.py

@@ -153,25 +153,51 @@ STACK_BLOCKS = {
         "args": [],
     },
     "goToFront": {
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "front")],
+    },
+    "goToBack": {
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "back")],
+    },
+    "goFront": {
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "front")],
+    },
+    "goBack": {
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "back")],
+    },
+    "goForwardLayers": {
         "opcode": "looks_goforwardbackwardlayers",
         "fields": [("FRONTBACK", "front")],
-        "args": [("NUM", "number", "args", True)],  # optional - default 1
+        "args": [("NUM", "number", "args")],
     },
-    "goToBack": {
+    "goBackLayers": {
         "opcode": "looks_goforwardbackwardlayers",
         "fields": [("FRONTBACK", "back")],
-        "args": [("NUM", "number", "args", True)],
+        "args": [("NUM", "number", "args")],
     },
-    "goBackLayers": {
+    "goFwdLyrs": {
+        "opcode": "looks_goforwardbackwardlayers",
+        "fields": [("FRONTBACK", "front")],
+        "args": [("NUM", "number", "args")],
+    },
+    "goBwdLyrs": {
         "opcode": "looks_goforwardbackwardlayers",
         "fields": [("FRONTBACK", "back")],
         "args": [("NUM", "number", "args")],
     },
-    "goForwardLayers": {
+    "goFwdLayers": {
         "opcode": "looks_goforwardbackwardlayers",
         "fields": [("FRONTBACK", "front")],
         "args": [("NUM", "number", "args")],
     },
+    "goBwdLayers": {
+        "opcode": "looks_goforwardbackwardlayers",
+        "fields": [("FRONTBACK", "back")],
+        "args": [("NUM", "number", "args")],
+    },
 
     # ---- Sound ----
     "playSound": {
@@ -552,8 +578,23 @@ REPORTERS = {
     # Looks
     "costumeName": {"opcode": "looks_costumename", "returns": "string"},
     "costumeNumber": {"opcode": "looks_costumenumber", "returns": "number"},
+    "costumeNumberName": {
+        "opcode": "looks_costumenumbername",
+        "fields": [("NUMBER_NAME", None)],
+        "returns": "any",
+    },
+    "cstmNumName": {
+        "opcode": "looks_costumenumbername",
+        "fields": [("NUMBER_NAME", None)],
+        "returns": "any",
+    },
     "backdropName": {"opcode": "looks_backdropname", "returns": "string"},
     "backdropNumber": {"opcode": "looks_backdropnumber", "returns": "number"},
+    "backdropNumberName": {
+        "opcode": "looks_backdropnumbername",
+        "fields": [("NUMBER_NAME", None)],
+        "returns": "any",
+    },
     "size": {"opcode": "looks_size", "returns": "number"},
 
     # Sound

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch/decompiler.py

@@ -478,6 +478,22 @@ class Decompiler:
             self._decompile_generic_block(blocks, block, ts_key, spec, indent)
             return
 
+        # Looks: go to front/back
+        if op == "looks_gotofrontback":
+            fb = block.get("fields", {}).get("FRONT_BACK", ["front"])[0]
+            self.output.append(f"{indent}goTo{fb.capitalize()}")
+            return
+
+        # Looks: go forward/backward layers
+        if op == "looks_goforwardbackwardlayers":
+            fb = block.get("fields", {}).get("FRONTBACK", ["front"])[0]
+            num = self._decompile_input(blocks, block, "NUM")
+            if fb == "front":
+                self.output.append(f"{indent}goForwardLayers({num})")
+            else:
+                self.output.append(f"{indent}goBackLayers({num})")
+            return
+
         # Unknown block - output as comment
         self.output.append(f"{indent}// TODO: unknown block {op}")
 
@@ -725,6 +741,12 @@ class Decompiler:
             return "costumeName"
         if op == "looks_costumenumber":
             return "costumeNumber"
+        if op == "looks_costumenumbername":
+            field = block.get("fields", {}).get("NUMBER_NAME", [""])[0]
+            return f"costumeNumberName({field})"
+        if op == "looks_backdropnumbername":
+            field = block.get("fields", {}).get("NUMBER_NAME", [""])[0]
+            return f"backdropNumberName({field})"
 
         # Sound
         if op == "sound_volume":
@@ -793,6 +815,34 @@ class Decompiler:
             args_str = ", ".join(str(a) for a in all_args)
             return f"{ts_key}({args_str})" if all_args else ts_key
 
+        # Menu shadow blocks (used as field values in dropdowns)
+        if op == "motion_goto_menu":
+            return block.get("fields", {}).get("TO", [""])[0]
+        if op == "motion_pointtowards_menu":
+            return block.get("fields", {}).get("TOWARDS", [""])[0]
+        if op == "motion_glideto_menu":
+            return block.get("fields", {}).get("TO", [""])[0]
+        if op == "sensing_of_object_menu":
+            return block.get("fields", {}).get("OBJECT", [""])[0]
+        if op == "sensing_touchingobjectmenu":
+            return block.get("fields", {}).get("TOUCHINGOBJECTMENU", [""])[0]
+        if op == "sensing_distancetomenu":
+            return block.get("fields", {}).get("DISTANCETOMENU", [""])[0]
+        if op == "sensing_keyoptions":
+            return block.get("fields", {}).get("KEY_OPTION", [""])[0]
+        if op == "control_create_clone_of_menu":
+            return block.get("fields", {}).get("CLONE_OPTION", [""])[0]
+        if op == "looks_backdrops":
+            return block.get("fields", {}).get("BACKDROP", [""])[0]
+        if op == "looks_costume":
+            return block.get("fields", {}).get("COSTUME", [""])[0]
+        if op == "sound_sounds_menu":
+            return block.get("fields", {}).get("SOUND_MENU", [""])[0]
+        if op == "sound_beats_menu":
+            return block.get("fields", {}).get("BEAT", [""])[0]
+        if op == "sound_effects_menu":
+            return block.get("fields", {}).get("EFFECT", [""])[0]
+
         # Unknown reporter
         return f"/* {op} */"
 

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typescratch
-Version: 1.6.0
+Version: 1.6.2
 Summary: A programming language that compiles to Scratch 3 (.sb3) files
 Author: TypeScratch
 License: Apache-2.0

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch.egg-info/SOURCES.txt

@@ -39,5 +39,6 @@ typescratch_pypi_release/typescratch_src/decompiler.py
 typescratch_pypi_release/typescratch_src/errors.py
 typescratch_pypi_release/typescratch_src/ide.py
 typescratch_pypi_release/typescratch_src/lexer.py
+typescratch_pypi_release/typescratch_src/package_manager.py
 typescratch_pypi_release/typescratch_src/parser.py
 typescratch_pypi_release/typescratch_src/sb3.py

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/__init__.py

@@ -46,7 +46,7 @@ from .codegen import Codegen
 from .sb3 import write_sb3, write_sb3_bytes
 
 
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 
 
 def compile_source(src: str, filename: str = "<tysh>", debug: bool = False,

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/ast_nodes.py

@@ -361,3 +361,39 @@ class ListReporterRef:
     method: str     # 'item' | 'length' | 'contains' | 'itemNum' | 'contents'
     args: List[Any]
     line: int = 0
+
+
+@dataclass
+class TernaryExpr:
+    """Ternary expression: [if (cond) true_val else false_val]
+
+    Desugared at codegen time into if/else that sets a temp variable.
+    """
+    cond: Any
+    true_expr: Any
+    false_expr: Any
+    line: int = 0
+
+
+@dataclass
+class SoundImport:
+    """sound name from "path.wav" - imports a sound file."""
+    name: str
+    path: str
+    line: int = 0
+
+
+@dataclass
+class CostumeImport:
+    """costume name from "path.png" - imports a costume file."""
+    name: str
+    path: str
+    line: int = 0
+
+
+@dataclass
+class LocalVarDecl:
+    """private x = value - declares a local variable inside a custom block."""
+    name: str
+    value: Any
+    line: int = 0

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/blocks.py

@@ -153,14 +153,17 @@ STACK_BLOCKS = {
         "args": [],
     },
     "goToFront": {
-        "opcode": "looks_goforwardbackwardlayers",
-        "fields": [("FRONTBACK", "front")],
-        "args": [("NUM", "number", "args", True)],  # optional - default 1
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "front")],
     },
     "goToBack": {
+        "opcode": "looks_gotofrontback",
+        "fields": [("FRONT_BACK", "back")],
+    },
+    "goForwardLayers": {
         "opcode": "looks_goforwardbackwardlayers",
-        "fields": [("FRONTBACK", "back")],
-        "args": [("NUM", "number", "args", True)],
+        "fields": [("FRONTBACK", "front")],
+        "args": [("NUM", "number", "args")],
     },
     "goBackLayers": {
         "opcode": "looks_goforwardbackwardlayers",
@@ -552,6 +555,11 @@ REPORTERS = {
     # Looks
     "costumeName": {"opcode": "looks_costumename", "returns": "string"},
     "costumeNumber": {"opcode": "looks_costumenumber", "returns": "number"},
+    "costumeNumberName": {
+        "opcode": "looks_costumenumbername",
+        "fields": [("NUMBER_NAME", None)],
+        "returns": "any",
+    },
     "backdropName": {"opcode": "looks_backdropname", "returns": "string"},
     "backdropNumber": {"opcode": "looks_backdropnumber", "returns": "number"},
     "size": {"opcode": "looks_size", "returns": "number"},

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/cli.py

@@ -51,6 +51,14 @@ def main(argv: Optional[List[str]] = None) -> int:
 
     sub.add_parser("meow", help="Print the Scratch Cat in ASCII art")
 
+    p_install = sub.add_parser("install", help="Install a package from GitHub")
+    p_install.add_argument("repo", help="github user/repo or user/repo@tag")
+
+    p_uninstall = sub.add_parser("uninstall", help="Remove an installed package")
+    p_uninstall.add_argument("name", help="package name")
+
+    sub.add_parser("list", help="List installed packages")
+
     sub.add_parser("version", help="Print version")
 
     args = parser.parse_args(argv)
@@ -80,6 +88,18 @@ def main(argv: Optional[List[str]] = None) -> int:
     if args.cmd == "meow":
         return _meow()
 
+    if args.cmd == "install":
+        from .package_manager import install
+        return install(args.repo)
+
+    if args.cmd == "uninstall":
+        from .package_manager import uninstall
+        return uninstall(args.name)
+
+    if args.cmd == "list":
+        from .package_manager import list_packages
+        return list_packages()
+
     if args.cmd in ("build", "run"):
         try:
             out_path = _file(args.source, out=args.out, debug=args.debug)

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/codegen.py

@@ -476,7 +476,7 @@ class Codegen:
                     "rotationCenterY": rcy,
                 })
         else:
-            # Sprite costume
+            # Sprite costume - use img= if specified
             path = target.img
             data, _ignored_md5ext, fmt, rcx, rcy = self._load_asset(path, is_stage=False)
             asset_id = _md5(data)
@@ -491,11 +491,73 @@ class Codegen:
                 "rotationCenterX": rcx,
                 "rotationCenterY": rcy,
             })
+            # Additional costumes from `costume name from "path.png"` imports
+            for cinfo in getattr(target, "_costume_imports", []):
+                cname = cinfo["name"]
+                cpath = cinfo["path"]
+                cdata, _cmd5, cfmt, crcx, crcy = self._load_asset(cpath, is_stage=False)
+                casset_id = _md5(cdata)
+                cmd5ext = f"{casset_id}.{cfmt}"
+                self.assets[cmd5ext] = cdata
+                costumes.append({
+                    "assetId": casset_id,
+                    "name": cname,
+                    "bitmapResolution": 1 if cfmt == "svg" else 2,
+                    "md5ext": cmd5ext,
+                    "dataFormat": cfmt,
+                    "rotationCenterX": crcx,
+                    "rotationCenterY": crcy,
+                })
         return costumes
 
     def gen_sounds(self, target: A.Target) -> List[dict]:
-        # No sound declaration syntax yet - emit an empty list
-        return []
+        """Generate sound assets from `sound name from "path.wav"` imports."""
+        sounds = []
+        for sinfo in getattr(target, "_sound_imports", []):
+            name = sinfo["name"]
+            path = sinfo["path"]
+            full = path
+            if self.asset_root and not os.path.isabs(path):
+                full = os.path.join(self.asset_root, path)
+            if os.path.isfile(full):
+                with open(full, "rb") as f:
+                    data = f.read()
+                # Determine format
+                if full.lower().endswith(".wav"):
+                    fmt = "wav"
+                elif full.lower().endswith(".mp3"):
+                    fmt = "mp3"
+                else:
+                    fmt = "wav"
+                asset_id = _md5(data)
+                md5ext = f"{asset_id}.{fmt}"
+                self.assets[md5ext] = data
+                sounds.append({
+                    "assetId": asset_id,
+                    "name": name,
+                    "dataFormat": fmt,
+                    "format": "",
+                    "rate": 48000,
+                    "sampleCount": 0,
+                    "md5ext": md5ext,
+                })
+            else:
+                # File not found - use silent fallback
+                from . import assets as ASSETS2
+                data = ASSETS2.SILENT_WAV
+                asset_id = _md5(data)
+                md5ext = f"{asset_id}.wav"
+                self.assets[md5ext] = data
+                sounds.append({
+                    "assetId": asset_id,
+                    "name": name,
+                    "dataFormat": "wav",
+                    "format": "",
+                    "rate": 48000,
+                    "sampleCount": 0,
+                    "md5ext": md5ext,
+                })
+        return sounds
 
     def _load_asset(self, path: Optional[str], is_stage: bool) -> Tuple[bytes, str, str, int, int]:
         """Returns (data, md5ext, format, rotationCenterX, rotationCenterY)."""
@@ -676,6 +738,11 @@ class Codegen:
                                          parent_id, stmt.line)
         if isinstance(stmt, A.BlockCall):
             return self.gen_block_call(stmt, parent_id)
+        if isinstance(stmt, A.LocalVarDecl):
+            return self.gen_var_assign(
+                A.VarAssign(name=stmt.name, value=stmt.value, line=stmt.line),
+                parent_id
+            )
         raise CompileError(f"unknown statement type: {type(stmt).__name__}", stmt.line)
 
     def gen_simple_stack(self, opcode: str, inputs_spec, parent_id, line) -> Tuple[str, str]:
@@ -1485,6 +1552,8 @@ class Codegen:
             return None, block_id
         if isinstance(expr, A.ListReporterRef):
             return self._gen_list_reporter(expr)
+        if isinstance(expr, A.TernaryExpr):
+            return self._gen_ternary(expr)
         if isinstance(expr, A.BuiltinRef):
             # Builtin reporter (e.g. answer, mouseX)
             spec = B.REPORTERS.get(expr.name)
@@ -1544,6 +1613,63 @@ class Codegen:
         # default: string literal
         return A.StringLit(value=name, line=ref.line)
 
+    def _gen_ternary(self, expr: A.TernaryExpr) -> Tuple[Optional[list], Optional[str]]:
+        """Generate a ternary expression [if (cond) x else y].
+
+        This is desugared into: a temp variable, set by an if/else.
+        We create the if/else blocks inline and return a VarRef to the temp.
+        """
+        # Create a temp variable
+        tmp_name = f"_ternary_{gen_id()[:8]}"
+        self._declare_var(tmp_name, 0)
+        vid = self.current_vars[tmp_name]
+
+        # Coerce the condition
+        cond = self._coerce_condition(expr.cond)
+        shadow_cond, sub_cond = self.gen_input_value(cond, "boolean")
+        cond_input = self._pack_input("boolean", shadow_cond, sub_cond)
+
+        # Generate the true branch: set tmp = true_expr
+        true_shadow, true_sub = self.gen_input_value(expr.true_expr, "any")
+        true_block_id = gen_id()
+        self.current_blocks[true_block_id] = {
+            "opcode": "data_setvariableto",
+            "next": None, "parent": None,
+            "inputs": {"VALUE": self._pack_input("any", true_shadow, true_sub)},
+            "fields": {"VARIABLE": [tmp_name, vid]},
+            "shadow": False, "topLevel": False,
+        }
+
+        # Generate the false branch: set tmp = false_expr
+        false_shadow, false_sub = self.gen_input_value(expr.false_expr, "any")
+        false_block_id = gen_id()
+        self.current_blocks[false_block_id] = {
+            "opcode": "data_setvariableto",
+            "next": None, "parent": None,
+            "inputs": {"VALUE": self._pack_input("any", false_shadow, false_sub)},
+            "fields": {"VARIABLE": [tmp_name, vid]},
+            "shadow": False, "topLevel": False,
+        }
+
+        # Generate the if/else block
+        if_block_id = gen_id()
+        self.current_blocks[if_block_id] = {
+            "opcode": "control_if_else",
+            "next": None, "parent": None,
+            "inputs": {
+                "CONDITION": cond_input,
+                "SUBSTACK": [2, true_block_id],
+                "SUBSTACK2": [2, false_block_id],
+            },
+            "fields": {},
+            "shadow": False, "topLevel": False,
+        }
+        self.current_blocks[true_block_id]["parent"] = if_block_id
+        self.current_blocks[false_block_id]["parent"] = if_block_id
+
+        # Return a variable reference to the temp
+        return [SHADOW_VAR, tmp_name, vid], None
+
     def _gen_list_reporter(self, expr: A.ListReporterRef) -> Tuple[Optional[list], Optional[str]]:
         """Generate a list reporter block (data_itemoflist, data_lengthoflist,
         data_listcontainsitem, data_itemnumoflist, data_listcontents).

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/decompiler.py

@@ -478,6 +478,22 @@ class Decompiler:
             self._decompile_generic_block(blocks, block, ts_key, spec, indent)
             return
 
+        # Looks: go to front/back
+        if op == "looks_gotofrontback":
+            fb = block.get("fields", {}).get("FRONT_BACK", ["front"])[0]
+            self.output.append(f"{indent}goTo{fb.capitalize()}")
+            return
+
+        # Looks: go forward/backward layers
+        if op == "looks_goforwardbackwardlayers":
+            fb = block.get("fields", {}).get("FRONTBACK", ["front"])[0]
+            num = self._decompile_input(blocks, block, "NUM")
+            if fb == "front":
+                self.output.append(f"{indent}goForwardLayers({num})")
+            else:
+                self.output.append(f"{indent}goBackLayers({num})")
+            return
+
         # Unknown block - output as comment
         self.output.append(f"{indent}// TODO: unknown block {op}")
 
@@ -725,6 +741,9 @@ class Decompiler:
             return "costumeName"
         if op == "looks_costumenumber":
             return "costumeNumber"
+        if op == "looks_costumenumbername":
+            field = block.get("fields", {}).get("NUMBER_NAME", [""])[0]
+            return f"costumeNumberName({field})"
 
         # Sound
         if op == "sound_volume":
@@ -793,6 +812,34 @@ class Decompiler:
             args_str = ", ".join(str(a) for a in all_args)
             return f"{ts_key}({args_str})" if all_args else ts_key
 
+        # Menu shadow blocks (used as field values in dropdowns)
+        if op == "motion_goto_menu":
+            return block.get("fields", {}).get("TO", [""])[0]
+        if op == "motion_pointtowards_menu":
+            return block.get("fields", {}).get("TOWARDS", [""])[0]
+        if op == "motion_glideto_menu":
+            return block.get("fields", {}).get("TO", [""])[0]
+        if op == "sensing_of_object_menu":
+            return block.get("fields", {}).get("OBJECT", [""])[0]
+        if op == "sensing_touchingobjectmenu":
+            return block.get("fields", {}).get("TOUCHINGOBJECTMENU", [""])[0]
+        if op == "sensing_distancetomenu":
+            return block.get("fields", {}).get("DISTANCETOMENU", [""])[0]
+        if op == "sensing_keyoptions":
+            return block.get("fields", {}).get("KEY_OPTION", [""])[0]
+        if op == "control_create_clone_of_menu":
+            return block.get("fields", {}).get("CLONE_OPTION", [""])[0]
+        if op == "looks_backdrops":
+            return block.get("fields", {}).get("BACKDROP", [""])[0]
+        if op == "looks_costume":
+            return block.get("fields", {}).get("COSTUME", [""])[0]
+        if op == "sound_sounds_menu":
+            return block.get("fields", {}).get("SOUND_MENU", [""])[0]
+        if op == "sound_beats_menu":
+            return block.get("fields", {}).get("BEAT", [""])[0]
+        if op == "sound_effects_menu":
+            return block.get("fields", {}).get("EFFECT", [""])[0]
+
         # Unknown reporter
         return f"/* {op} */"
 

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/lexer.py

@@ -76,6 +76,9 @@ KEYWORDS = {
     "mod": "MOD",
     "true": "TRUE",
     "false": "FALSE",
+    "sound": "SOUND_KW",
+    "costume": "COSTUME_KW",
+    "private": "PRIVATE_KW",
 }
 
 # Attribute prefixes that bind tightly to '='

typescratch-1.6.2/typescratch_pypi_release/typescratch_src/package_manager.py

@@ -0,0 +1,127 @@
+"""TypeScratch Package Manager - install libraries from GitHub.
+
+Usage:
+    typescratch install <github-user/repo>
+    typescratch install <github-user/repo>@<tag>
+    typescratch uninstall <package-name>
+    typescratch list
+
+Packages are cloned into ./typescratch_packages/<repo-name>/
+and can be fused with: fuse "typescratch_packages/<repo-name>/main.tysh"
+"""
+
+import os
+import sys
+import shutil
+import subprocess
+from typing import Optional
+
+
+PACKAGES_DIR = "typescratch_packages"
+
+
+def install(repo: str) -> int:
+    """Install a package from GitHub.
+
+    repo can be:
+      user/repo
+      user/repo@tag
+      https://github.com/user/repo
+    """
+    # Parse the repo spec
+    tag = None
+    if "@" in repo:
+        repo, tag = repo.rsplit("@", 1)
+
+    # Clean up URL form
+    if repo.startswith("https://github.com/"):
+        repo = repo[len("https://github.com/"):]
+
+    # Build the clone URL
+    clone_url = f"https://github.com/{repo}.git"
+
+    # Extract repo name
+    repo_name = repo.split("/")[-1] if "/" in repo else repo
+
+    # Create packages dir
+    if not os.path.exists(PACKAGES_DIR):
+        os.makedirs(PACKAGES_DIR)
+
+    dest = os.path.join(PACKAGES_DIR, repo_name)
+
+    # If already exists, remove it
+    if os.path.exists(dest):
+        print(f"Package {repo_name} already installed, updating...")
+        shutil.rmtree(dest)
+
+    # Clone
+    print(f"Installing {repo_name} from {clone_url}...")
+    cmd = ["git", "clone", "--depth", "1"]
+    if tag:
+        cmd.extend(["--branch", tag])
+    cmd.extend([clone_url, dest])
+
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
+        if result.returncode != 0:
+            print(f"Error: git clone failed: {result.stderr}", file=sys.stderr)
+            return 1
+    except FileNotFoundError:
+        print("Error: git is not installed. Install git first.", file=sys.stderr)
+        return 1
+    except subprocess.TimeoutExpired:
+        print("Error: git clone timed out.", file=sys.stderr)
+        return 1
+
+    # Remove .git directory to save space
+    git_dir = os.path.join(dest, ".git")
+    if os.path.exists(git_dir):
+        shutil.rmtree(git_dir)
+
+    print(f"Installed {repo_name} to {dest}/")
+
+    # Check for a main.tysh file
+    main_file = os.path.join(dest, "main.tysh")
+    if os.path.isfile(main_file):
+        print(f"\nTo use this package, add this to your .tysh file:")
+        print(f'  fuse "{PACKAGES_DIR}/{repo_name}/main.tysh"')
+    else:
+        # List .tysh files
+        tysh_files = [f for f in os.listdir(dest) if f.endswith(".tysh")]
+        if tysh_files:
+            print(f"\nAvailable .tysh files:")
+            for f in tysh_files:
+                print(f'  fuse "{PACKAGES_DIR}/{repo_name}/{f}"')
+        else:
+            print(f"\nNo .tysh files found in package.")
+
+    return 0
+
+
+def uninstall(name: str) -> int:
+    """Remove an installed package."""
+    dest = os.path.join(PACKAGES_DIR, name)
+    if not os.path.exists(dest):
+        print(f"Package {name} is not installed.", file=sys.stderr)
+        return 1
+    shutil.rmtree(dest)
+    print(f"Uninstalled {name}")
+    return 0
+
+
+def list_packages() -> int:
+    """List installed packages."""
+    if not os.path.exists(PACKAGES_DIR):
+        print("No packages installed.")
+        return 0
+    packages = [d for d in os.listdir(PACKAGES_DIR)
+                if os.path.isdir(os.path.join(PACKAGES_DIR, d))]
+    if not packages:
+        print("No packages installed.")
+        return 0
+    print(f"Installed packages ({len(packages)}):")
+    for p in sorted(packages):
+        dest = os.path.join(PACKAGES_DIR, p)
+        tysh_files = [f for f in os.listdir(dest) if f.endswith(".tysh")]
+        print(f"  {p} ({len(tysh_files)} .tysh files)")
+    return 0

{typescratch-1.6.0 → typescratch-1.6.2}/typescratch_pypi_release/typescratch_src/parser.py

@@ -157,6 +157,22 @@ class Parser:
                 self.skip_eol()
                 continue
 
+            # Sound import: sound name from "path.wav"
+            if t.type == "SOUND_KW" and self._is_at_line_start():
+                if current_sprite is None:
+                    self.err("sound import with no sprite context")
+                self._parse_sound_import(current_sprite)
+                self.skip_eol()
+                continue
+
+            # Costume import: costume name from "path.png"
+            if t.type == "COSTUME_KW" and self._is_at_line_start():
+                if current_sprite is None:
+                    self.err("costume import with no sprite context")
+                self._parse_costume_import(current_sprite)
+                self.skip_eol()
+                continue
+
             self.err(f"unexpected top-level token {t.type} ({t.value!r})")
 
         # Make sure there's always a stage
@@ -252,7 +268,6 @@ class Parser:
                 break
             # Stop at top-level `s "..."` or `b "..."` (next sprite/backdrop)
             if t.type == "NAME" and t.value in ("s", "b") and self._is_at_line_start():
-                # Peek ahead: is the next token a name/string? Then it's a declarator.
                 if self.peek(1).type in ("STRING", "NAME", "TEXT"):
                     break
             if t.type == "WHEN":
@@ -264,6 +279,14 @@ class Parser:
             if t.type == "NAME" and t.value == "list" and self._is_at_line_start():
                 self._parse_list_decl(sprite)
                 continue
+            # Sound import: sound name from "path.wav"
+            if t.type == "SOUND_KW" and self._is_at_line_start():
+                self._parse_sound_import(sprite)
+                continue
+            # Costume import: costume name from "path.png"
+            if t.type == "COSTUME_KW" and self._is_at_line_start():
+                self._parse_costume_import(sprite)
+                continue
             # otherwise: stop - we're at the next target / eof
             break
 
@@ -459,6 +482,42 @@ class Parser:
         self.eat("RBRACKET", "']'")
         return A.Hat(kind="greater_than", args=[what, val], line=line)
 
+    def _parse_ternary_value(self):
+        """Parse a single value for a ternary expression.
+
+        This is like _parse_atom but stops at 'else' (doesn't consume it
+        as part of a bare string).
+        """
+        t = self.peek()
+        if t.type == "ELSE":
+            self.err("expected a value before 'else' in ternary")
+        if t.type == "STRING":
+            self.next()
+            return A.StringLit(value=t.value, line=t.line)
+        if t.type == "NUM":
+            self.next()
+            val = float(t.value) if "." in t.value else int(t.value)
+            return A.NumberLit(value=val, line=t.line)
+        if t.type == "HEXCOLOR":
+            self.next()
+            return A.ColorLit(value=t.value, line=t.line)
+        if t.type == "LPAREN":
+            self.next()
+            self.skip_eol()
+            expr = self._parse_expr()
+            self.skip_eol()
+            self.eat("RPAREN", "')'")
+            return expr
+        if t.type in ("NAME", "TEXT"):
+            # Parse a single bare name or function call, but DON'T
+            # accumulate following words (since "else" could be next)
+            name = self.next().value
+            if self.at("LPAREN"):
+                args = self._parse_paren_args()
+                return A.FuncCall(name=name, args=args, line=t.line)
+            return A.BareRef(name=name, line=t.line)
+        self.err(f"unexpected token in ternary value: {t.type} ({t.value!r})")
+
     def _read_bracket_text(self) -> str:
         """Read text inside [ ] - can be multi-word.  Returns the joined string.
 
@@ -542,10 +601,6 @@ class Parser:
             return A.StopStatement(kind=kind, line=line)
         if t.type == "BROADCAST":
             self.next()
-            # Three forms:
-            #   broadcast [msg]              (Scratch-style menu)
-            #   broadcast(msg)               (function-style)
-            #   broadcast msg                (bare)
             msg: Any
             if self.at("LBRACKET"):
                 self.next()
@@ -559,7 +614,6 @@ class Parser:
             else:
                 msg = self._parse_expr()
             wait = False
-            # check for "and wait"
             if self.at("AND") or (self.at("NAME", "TEXT") and self.peek().value == "and"):
                 self.next()
                 if not (self.at("WAIT") or (self.at("NAME", "TEXT") and self.peek().value == "wait")):
@@ -567,6 +621,15 @@ class Parser:
                 self.next()
                 wait = True
             return A.BroadcastStatement(msg=msg, wait=wait, line=line)
+
+        # private x = value  (local variable inside a custom block)
+        if t.type == "PRIVATE_KW":
+            self.next()
+            var_name = self._read_name_or_string()
+            self.eat("ASSIGN", "'='")
+            val = self._parse_expr()
+            self.current_vars.add(var_name)
+            return A.LocalVarDecl(name=var_name, value=val, line=line)
         if t.type == "DEF":
             # def at statement level (inside a script - unusual but allowed)
             # We need a sprite context; create a dummy def container
@@ -920,12 +983,28 @@ class Parser:
             # [expr] - used for menu choices, but also a grouping
             self.next()
             self.skip_eol()
+            # Check for ternary: [if (cond) x else y]
+            if self.at("IF"):
+                self.next()
+                cond = self._parse_expr()
+                # Parse true_expr - but stop at ELSE
+                # We need to parse a single atom for the true value
+                # because _parse_expr would consume "else" as a bare word
+                true_expr = self._parse_ternary_value()
+                # expect "else"
+                if not self.at("ELSE"):
+                    self.err("expected 'else' in ternary [if (cond) x else y]")
+                self.next()
+                false_expr = self._parse_ternary_value()
+                self.skip_eol()
+                self.eat("RBRACKET", "']'")
+                return A.TernaryExpr(cond=cond, true_expr=true_expr, false_expr=false_expr, line=t.line)
             expr = self._parse_expr()
             self.skip_eol()
             self.eat("RBRACKET", "']'")
             return expr
 
-        if t.type in ("NAME", "TEXT"):
+        if t.type in ("NAME", "TEXT", "SOUND_KW", "COSTUME_KW", "PRIVATE_KW"):
             # Accumulate consecutive bare words into a string.
             # If the next token is LPAREN, this is a function call.
             # If the next token is DOT, this is namespace access.
@@ -979,7 +1058,8 @@ class Parser:
                          "WAIT", "WAIT_UNTIL", "STOP", "BROADCAST", "IF", "ELSE", "ELIF",
                          "REPEAT", "REPEAT_UNTIL", "FOREVER", "WHILE", "WHEN",
                          "FOR_EACH", "ALL_AT_ONCE",
-                         "DEF", "TRUE", "FALSE", "EXTENSION")
+                         "DEF", "TRUE", "FALSE", "EXTENSION",
+                         "SOUND_KW", "COSTUME_KW", "PRIVATE_KW")
             words = [name]
             while self.at(*WORD_LIKE):
                 words.append(str(self.next().value))
@@ -1045,6 +1125,47 @@ class Parser:
         ))
 
     # ---- list declarations ----
+    def _parse_sound_import(self, sprite: A.Target) -> None:
+        """Parse: sound name from "path.wav" """
+        self.next()  # consume 'sound'
+        name = self._read_name_or_string()
+        # expect "from"
+        if not (self.at("NAME", "TEXT") and self.peek().value == "from"):
+            self.err("expected 'from' in: sound name from \"path.wav\"")
+        self.next()
+        path_tok = self.peek()
+        if path_tok.type == "STRING":
+            path = self.next().value
+        elif path_tok.type == "PATH":
+            path = self.next().value
+        elif path_tok.type in ("NAME", "TEXT"):
+            path = self.next().value
+        else:
+            self.err("expected file path after 'from'")
+        if not hasattr(sprite, "_sound_imports"):
+            sprite._sound_imports = []
+        sprite._sound_imports.append({"name": name, "path": path})
+
+    def _parse_costume_import(self, sprite: A.Target) -> None:
+        """Parse: costume name from "path.png" """
+        self.next()  # consume 'costume'
+        name = self._read_name_or_string()
+        if not (self.at("NAME", "TEXT") and self.peek().value == "from"):
+            self.err("expected 'from' in: costume name from \"path.png\"")
+        self.next()
+        path_tok = self.peek()
+        if path_tok.type == "STRING":
+            path = self.next().value
+        elif path_tok.type == "PATH":
+            path = self.next().value
+        elif path_tok.type in ("NAME", "TEXT"):
+            path = self.next().value
+        else:
+            self.err("expected file path after 'from'")
+        if not hasattr(sprite, "_costume_imports"):
+            sprite._costume_imports = []
+        sprite._costume_imports.append({"name": name, "path": path})
+
     def _parse_list_decl(self, sprite: A.Target) -> None:
         # The "list" keyword has already been peeked but not consumed.
         list_tok = self.peek()