minecraft-datapack-language 15.1.52__py3-none-any.whl → 15.1.54__py3-none-any.whl

minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.1.52'
-__version_tuple__ = version_tuple = (15, 1, 52)
+__version__ = version = '15.1.54'
+__version_tuple__ = version_tuple = (15, 1, 54)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -355,8 +355,17 @@ def _generate_hook_files(ast: Dict[str, Any], output_dir: Path, namespace: str,
     load_tag_dir = output_dir / "data" / "minecraft" / "tags" / "function"
     ensure_dir(str(load_tag_dir))
     
+    # Start with the load function
+    load_values = [f"{namespace}:load"]
+    
+    # Add functions specified in on_load hooks
+    if 'hooks' in ast:
+        for hook in ast['hooks']:
+            if hook['hook_type'] == 'load':
+                load_values.append(hook['function_name'])
+    
     load_tag_content = {
-        "values": [f"{namespace}:load"]
+        "values": load_values
     }
     write_json(str(load_tag_dir / "load.json"), load_tag_content)
     
@@ -729,12 +738,12 @@ def build_mdl(input_path: str, output_path: str, verbose: bool = False, pack_for
         # Generate global load function
         _generate_global_load_function(ast, output_dir, namespace, build_context)
         
-        # Create zip file if wrapper is specified
-        if wrapper:
-            zip_path = output_dir.parent / f"{wrapper}.zip"
-            _create_zip_file(output_dir, zip_path)
-            if verbose:
-                print(f"[ZIP] Created zip file: {zip_path}")
+        # Create zip file (always create one, use wrapper name if specified)
+        zip_name = wrapper if wrapper else output_dir.name
+        zip_path = output_dir / f"{zip_name}.zip"
+        _create_zip_file(output_dir, zip_path)
+        if verbose:
+            print(f"[ZIP] Created zip file: {zip_path}")
         
         print(f"[OK] Successfully built datapack: {output_path}")
         if verbose:

minecraft_datapack_language/cli_check.py

@@ -2,6 +2,7 @@
 CLI Check Functions - Validation and error checking for MDL files
 """
 
+import sys
 from pathlib import Path
 from typing import Optional
 
@@ -42,7 +43,36 @@ def lint_mdl_file_wrapper(file_path: str, verbose: bool = False, ignore_warnings
         
         # Perform linting
         try:
-            lint_mdl_file(str(path))
+            issues = lint_mdl_file(str(path))
+            
+            # Check if there are any errors
+            errors = [issue for issue in issues if issue.severity == 'error']
+            warnings = [issue for issue in issues if issue.severity == 'warning']
+            
+            if errors:
+                # Report errors
+                print(f"[CHECK] Found {len(errors)} error(s) in: {file_path}")
+                for i, issue in enumerate(errors, 1):
+                    print(f"Error {i}: {issue.message}")
+                    if issue.suggestion:
+                        print(f"  Suggestion: {issue.suggestion}")
+                    if issue.code:
+                        print(f"  Code: {issue.code}")
+                    print()
+                
+                # Exit with error code
+                sys.exit(1)
+            elif warnings and not ignore_warnings:
+                # Report warnings
+                print(f"[CHECK] Found {len(warnings)} warning(s) in: {file_path}")
+                for i, issue in enumerate(warnings, 1):
+                    print(f"Warning {i}: {issue.message}")
+                    if issue.suggestion:
+                        print(f"  Suggestion: {issue.suggestion}")
+                    if issue.code:
+                        print(f"  Code: {issue.code}")
+                    print()
+            
             print(f"[CHECK] Successfully checked: {file_path}")
             print("[OK] No errors found!")
         

minecraft_datapack_language/mdl_linter.py

@@ -42,6 +42,47 @@ class MDLLinter:
             return self.issues
         
         try:
+            # First, try to parse the file with the actual parser to catch syntax errors
+            try:
+                from .mdl_parser_js import parse_mdl_js
+                with open(file_path, 'r', encoding='utf-8') as f:
+                    source = f.read()
+                
+                # Parse the file - this will catch syntax errors like missing semicolons
+                parse_mdl_js(source, file_path)
+                
+            except Exception as parse_error:
+                # If parsing fails, add the error to our issues
+                error_message = str(parse_error)
+                if "Expected SEMICOLON" in error_message:
+                    # Extract line and column from the error message
+                    import re
+                    line_match = re.search(r'Line: (\d+)', error_message)
+                    column_match = re.search(r'Column: (\d+)', error_message)
+                    line_num = int(line_match.group(1)) if line_match else 1
+                    column_num = int(column_match.group(1)) if column_match else 1
+                    
+                    self.issues.append(MDLLintIssue(
+                        line_number=line_num,
+                        severity='error',
+                        category='syntax',
+                        message="Missing semicolon",
+                        suggestion="Add a semicolon (;) at the end of the statement",
+                        code=source.split('\n')[line_num - 1] if line_num <= len(source.split('\n')) else ""
+                    ))
+                else:
+                    # For other parsing errors, add them as well
+                    self.issues.append(MDLLintIssue(
+                        line_number=1,
+                        severity='error',
+                        category='syntax',
+                        message=f"Parsing error: {error_message}",
+                        suggestion="Check the syntax and fix the reported error",
+                        code=""
+                    ))
+                    return self.issues
+            
+            # If parsing succeeds, do additional linting checks
             with open(file_path, 'r', encoding='utf-8') as f:
                 lines = f.readlines()
             

{minecraft_datapack_language-15.1.52.dist-info → minecraft_datapack_language-15.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.52
+Version: 15.1.54
 Summary: Compile JavaScript-style MDL language or Python API into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

{minecraft_datapack_language-15.1.52.dist-info → minecraft_datapack_language-15.1.54.dist-info}/RECORD

@@ -1,9 +1,9 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=e7LI5GHD8E_AkxUwqvouD-eLBRqOyRBFHuHDGo6xIv8,708
+minecraft_datapack_language/_version.py,sha256=MJnAS01Xj9LllNeVM6ZB7QjcnbHlUMSoJJjZit4by0o,708
 minecraft_datapack_language/ast_nodes.py,sha256=pgjI2Nlap3ixFPgWqGSkqncG9zB91h5BKgRjtcJqMew,2118
 minecraft_datapack_language/cli.py,sha256=p5A_tEEXugN2NhQFbbgfwi4FxbWYD91RWeKR_A3Vuec,6263
-minecraft_datapack_language/cli_build.py,sha256=tT00tCj384d0aZYNYP19TosuEydVVxMEogk8B5lj_48,32115
-minecraft_datapack_language/cli_check.py,sha256=vzSD9w0_TUcNrfYQBlAmDljiMlnuf8QL_j5HrAwhuYE,4950
+minecraft_datapack_language/cli_build.py,sha256=JPQmdr7DbVCZ0Ra5-svhaPlBEuu7drtMFb5vjGLkL4Y,32440
+minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_help.py,sha256=jUTHUQBONAZKVTdQK9tNPXq4c_6xpsafNOvHDjkEldg,12243
 minecraft_datapack_language/cli_new.py,sha256=KGbKcZW3POwZFAS0nzcwl2NoTUygXzwcUe-iWYyPKEg,8268
 minecraft_datapack_language/cli_utils.py,sha256=gLGe2nAn8pLiSJhn-DpNvMxo0th_Gj89I-oSeyPx4zU,9293
@@ -12,13 +12,13 @@ minecraft_datapack_language/expression_processor.py,sha256=GN6cuRNvgI8TrV6YnEHrA
 minecraft_datapack_language/linter.py,sha256=7UqbygC5JPCGg-BSOq65NB2xEJBu_OUOYIIgmHItO2M,16567
 minecraft_datapack_language/mdl_errors.py,sha256=a_-683gjF3gfGRpDMbRgCXmXD9_aYYBmLodNH6fe29A,11596
 minecraft_datapack_language/mdl_lexer_js.py,sha256=G2leNsQz7792uiGig7d1AcQCOFNnmACJD_pXI0wTxGc,26169
-minecraft_datapack_language/mdl_linter.py,sha256=pa1BGx9UWXkF-iKh4XNHpuh0zIaOEYt9pwMa-NjxWaw,15129
+minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser_js.py,sha256=Ng22mKVbMNC4412Xb09i8fcNFPTPrW4NxFeK7Tv7EBQ,38539
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.52.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.52.dist-info/METADATA,sha256=LTNaPMXjaitPT-Hnqk4VUJ93prVA28h-_Zib1XdFxXI,35230
-minecraft_datapack_language-15.1.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.52.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.52.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.52.dist-info/RECORD,,
+minecraft_datapack_language-15.1.54.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.54.dist-info/METADATA,sha256=PsesUE-ZUUVm84GX7i-kS2JtAZ1oQD3QApGhICUb_aU,35230
+minecraft_datapack_language-15.1.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.54.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.54.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.54.dist-info/RECORD,,