pyscreeps-arena 0.5.7.6__tar.gz → 0.5.8.2__tar.gz

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.7.6
+Version: 0.5.8.2
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.8.2}/pyscreeps_arena/compiler.py

@@ -17,6 +17,10 @@ python_version_info = sys.version_info
 python_version_info = f"{python_version_info.major}.{python_version_info.minor}.{python_version_info.micro}"
 
 
+class MatchCaseError(Exception):
+    pass
+
+
 def replace_src_prefix(file_list):
     """
     将列表中以'./src.'开头的字符串替换为'./'
@@ -28,16 +32,17 @@ def replace_src_prefix(file_list):
         替换后的新列表
     """
     _ = []
-    
+
     for item in file_list:
         if isinstance(item, str) and item.startswith('./src.'):
             _new = item.replace('./src.', './', 1)
             if _new in file_list:
                 continue
         _.append(item)
-    
+
     return _
 
+
 # def InsertPragmaBefore(content:str) -> str:
 #     """
 #     在content的开头插入__pragma__('noalias', 'undefined')等内容 |
@@ -160,8 +165,8 @@ class GameConstructionBoost{{
 }};
 import {{ Portal as GamePortal}} from 'arena/season_{config.season}/{const.ARENA_GREEN}/{"advanced" if config.level in ["advance", "advanced"] else "basic"}/prototypes';
         """,
-# import {Portal} from 'arena/season_1/portal_exploration/basic/prototypes';
-        
+        # import {Portal} from 'arena/season_1/portal_exploration/basic/prototypes';
+
         const.ARENA_BLUE: lambda: f"""
 const ARENA_COLOR_TYPE = "BLUE";
 const GameScoreCollector = GameStructureSpawn;
@@ -415,8 +420,7 @@ class Compiler_Utils(Compiler_Const):
                             py_files.append(item)
                         elif os.path.isdir(_path):
                             rel = os.path.relpath(final_dir_path, project_path)
-                            core.warn(f'Compiler.expand_folder_imports', core.lformat(LOC_DIR_UNDER_NONINIT_DIR, [item, rel]), end='', head='\n', ln=config.language )
-                            
+                            core.warn(f'Compiler.expand_folder_imports', core.lformat(LOC_DIR_UNDER_NONINIT_DIR, [item, rel]), end='', head='\n', ln=config.language)
 
                     # 为每个 .py 文件生成导入语句
                     if py_files:
@@ -436,7 +440,6 @@ class Compiler_Utils(Compiler_Const):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-
     def find_chain_import(self, fpath: str, search_dirs: list[str], project_path: str = None, records: dict[str, None] = None) -> list[str]:
         r"""
         查找文件中的所有import语句，并返回所有import的文件路径 | find all import statements in a file and return the paths of all imported files
@@ -572,13 +575,13 @@ class Compiler_Utils(Compiler_Const):
         return imps
 
     @staticmethod
-    def relist_pyimports_to_jsimports(base_dir:str, pyimps:list[str]) -> list[str]:
+    def relist_pyimports_to_jsimports(base_dir: str, pyimps: list[str]) -> list[str]:
         """
         将python的imports路径列表转换为js的imports路径列表 | convert a list of python imports paths to a list of js imports paths
         """
         jsimps = []
         for pyimp in pyimps:
-            rel_path_nodes:list[str] = os.path.relpath(pyimp, base_dir).replace('\\', '/').split('/')
+            rel_path_nodes: list[str] = os.path.relpath(pyimp, base_dir).replace('\\', '/').split('/')
             if rel_path_nodes[-1] == '__init__.py':
                 rel_path_nodes.pop()
             else:
@@ -644,7 +647,7 @@ class Compiler_Utils(Compiler_Const):
             result = '\n'.join(calls_to_add) + '\n' + result
 
         return result
-    
+
     @staticmethod
     def process_mate_code(code):
         # 用于存储匹配到的信息
@@ -678,12 +681,11 @@ class Compiler_Utils(Compiler_Const):
         for variable_name, class_name in mate_assignments:
             output_string = f"# > insert Object.defineProperty ({class_name}, '{variable_name}', property.call ({class_name}, {class_name}.{variable_name}._MateGet_, {class_name}.{variable_name}._MateSet_));"
             output_strings.append(output_string)
-        
-        return code + '\n'.join(output_strings)
 
+        return code + '\n'.join(output_strings)
 
     @staticmethod
-    def remove_long_docstring(content:str) -> str:
+    def remove_long_docstring(content: str) -> str:
         """
         移除长注释 | remove long docstring
         """
@@ -1082,7 +1084,6 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(content)
 
-
         core.lprint(GREEN.format('[2/6]'), LOC_DONE, " ", LOC_PREPROCESSING_FINISH, sep="", head="\r", ln=config.language)
         return _imports, _js_imports, _pre_sort_, _pre_define_, _js_replace_
 
@@ -1153,7 +1154,7 @@ class Compiler(CompilerBase):
 
         content = self.auto_read(self.target_js)
         if modules is None: modules = []
-        new_modules, new_content = [],""
+        new_modules, new_content = [], ""
         for line in content.split('\n'):
             m = re.search(self.JS_IMPORT_PAT, line)
             if not m:
@@ -1199,7 +1200,7 @@ class Compiler(CompilerBase):
         """
         return re.sub(r'import[^\n]*\n', '', raw)
 
-    def generate_total_js(self, usr_modules, t_imps: list[str], f_sorts, f_replaces, g_replaces) -> str:
+    def generate_total_js(self, usr_modules, t_imps: list[str], f_sorts, f_replaces, g_replaces, min_js_files=None) -> str:
         """
         生成总的main.js
         按照如下顺序组合:
@@ -1213,6 +1214,7 @@ class Compiler(CompilerBase):
         :param f_sorts: dict{module_name: sort_priority}
         :param f_replaces: dict{module_name: dict{old: new}}
         :param g_replaces: dict{old: new}
+        :param min_js_files: list[str]  # .min.js文件路径列表
         :return: str
         """
         arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES['green'])  # like green -> spawn_and_swamp
@@ -1220,6 +1222,13 @@ class Compiler(CompilerBase):
         total_js = f"const __VERSION__ = '{const.VERSION}';\nconst __PYTHON_VERSION__ = '{python_version_info}';" + self.TOTAL_INSERT_AT_HEAD + f"\nexport var LANGUAGE = '{config.language}';\n"
         total_js += f"const __AUTHOR__ = '{const.AUTHOR}';\nconst __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"
 
+        # 添加.min.js文件的import语句
+        if min_js_files:
+            for min_js_path in min_js_files:
+                min_js_filename = os.path.basename(min_js_path)
+                total_js += f"\nimport \"./{min_js_filename}\";"
+            total_js += "\n"
+
         core.lprint(WAIT, LOC_GENERATING_TOTAL_MAIN_JS, end="", ln=config.language)
 
         # TODO: IMPS donot work
@@ -1285,19 +1294,29 @@ class Compiler(CompilerBase):
     def find_add_pure_js_files(self, sorts, modules):
         """
         找到所有的纯js文件，并添加到modules中
+        忽略.min.js文件，这些文件会被单独处理
         :param sorts:
         :param modules:
-        :return:
+        :return: list 返回所有.min.js文件的列表
         """
+        min_js_files = []
         for root, dirs, files in os.walk(self.lib_dir):
             for file in files:
                 if file.endswith('.js') and file not in modules:
-                    fpath = str(os.path.join(root, file))
-                    fname = file.replace('\\', '/')
-                    # copy file to target
-                    shutil.copy(fpath, os.path.join(self.target_dir, fname))
-                    sorts[fname] = self.__parse_js_file_sort(fpath)
-                    modules.append("./" + fname)
+                    # 如果是.min.js文件，不拷贝到target，而是记录到单独列表
+                    if file.endswith('.min.js'):
+                        fpath = str(os.path.join(root, file))
+                        min_js_files.append(fpath)
+                    else:
+                        # 普通js文件，按原逻辑处理
+                        fpath = str(os.path.join(root, file))
+                        fname = file.replace('\\', '/')
+                        # copy file to target
+                        shutil.copy(fpath, os.path.join(self.target_dir, fname))
+                        sorts[fname] = self.__parse_js_file_sort(fpath)
+                        modules.append("./" + fname)
+
+        return min_js_files
 
     def compile(self, paste=False):
         """
@@ -1308,8 +1327,7 @@ class Compiler(CompilerBase):
         imps, jimps, sorts, defs, reps = self.pre_compile()
         self.transcrypt_cmd()
         imports, modules = self.analyze_rebuild_main_js(defs, jimps)
-        self.find_add_pure_js_files(sorts, modules)
-        total_js = imports + "\n" + self.generate_total_js(replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps)
+        min_js_files = self.find_add_pure_js_files(sorts, modules)
 
         core.lprint(WAIT, LOC_EXPORTING_TOTAL_MAIN_JS, end="", ln=config.language)
 
@@ -1320,12 +1338,28 @@ class Compiler(CompilerBase):
         if not mjs_path.endswith('js'):
             mjs_path = os.path.join(mjs_path, 'main.mjs')
 
+        # 获取目标目录路径
+        dir_path = os.path.dirname(mjs_path)
+        build_dir_path = os.path.dirname(build_main_mjs)
+
+        # 复制.min.js文件到目标目录
+        for min_js_path in min_js_files:
+            min_js_filename = os.path.basename(min_js_path)
+            # 复制到build目录
+            shutil.copy(min_js_path, os.path.join(build_dir_path, min_js_filename))
+            # 复制到最终导出目录
+            shutil.copy(min_js_path, os.path.join(dir_path, min_js_filename))
+
+        # 生成total_js，传入.min.js文件列表
+        total_js = imports + "\n" + self.generate_total_js(
+            replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps, min_js_files
+        )
+
         # write main.mjs
         with open(build_main_mjs, 'w', encoding='utf-8') as f:
             f.write(total_js)
 
         # export main.mjs
-        dir_path = os.path.dirname(mjs_path)
         if not os.path.exists(dir_path):
             core.error('Compiler.compile', core.lformat(LOC_EXPORT_DIR_PATH_NOT_EXISTS, [dir_path]), head='\n', ln=config.language)
         with open(mjs_path, 'w', encoding='utf-8') as f:

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.8.2}/pyscreeps_arena/core/const.py

@@ -9,7 +9,7 @@
 #
 import re
 
-VERSION = "0.5.7.6"
+VERSION = "0.5.8.2"
 AUTHOR = "●ω＜🤍♪"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.8.2}/pyscreeps_arena.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.7.6
+Version: 0.5.8.2
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.8.2}/setup.py

@@ -7,7 +7,7 @@ with open(r"T:\New_PC\Import_Project\uploads\pyscreeps-arena_upload\pyscreeps-ar
     long_description = f.read()
 setup(
     name='pyscreeps-arena',
-    version='0.5.7.6',
+    version='0.5.8.2',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',