pyscreeps-arena 0.4a2__tar.gz → 0.4a3__tar.gz

{pyscreeps-arena-0.4a2 → pyscreeps-arena-0.4a3}/PKG-INFO

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

{pyscreeps-arena-0.4a2 → pyscreeps-arena-0.4a3}/pyscreeps_arena/compiler.py

@@ -164,15 +164,11 @@ class GameFlag{{
     constructor(){{ 
     }}
 }};
-import {{ RESOURCE_SCORE, ScoreCollector as GameScoreCollector, AreaEffect as GameAreaEffect, EFFECT_DAMAGE, EFFECT_FREEZE }} from 'arena/season_{config.season}/collect_and_control/basic';
+import {{ ScoreCollector as GameScoreCollector, AreaEffect as GameAreaEffect, EFFECT_DAMAGE, EFFECT_FREEZE }} from 'arena/season_{config.season}/collect_and_control/{"advanced" if config.level in ["advance", "advanced"] else "basic"}';
 
-{'''import ("arena/season_{config.season}/collect_and_control/advanced")
-.then((module) => {{ const RESOURCE_SCORE_X = module.RESOURCE_SCORE_X; const RESOURCE_SCORE_Y = module.RESOURCE_SCORE_Y; const RESOURCE_SCORE_Z = module.RESOURCE_SCORE_Z; }})
-.catch((error) => {{ const RESOURCE_SCORE_X = "undefined"; const RESOURCE_SCORE_Y = "undefined"; const RESOURCE_SCORE_Z = "undefined"; }});''' if config.level in ['advanced', 'advanced'] else '''
-const RESOURCE_SCORE_X = "undefined";
-const RESOURCE_SCORE_Y = "undefined";
-const RESOURCE_SCORE_Z = "undefined";
-'''}
+{f"import {{ RESOURCE_SCORE_X, RESOURCE_SCORE_Y, RESOURCE_SCORE_Z }} from 'arena/season_{config.season}/collect_and_control/advanced';" if config.level in ["advance", "advanced"] else 'const RESOURCE_SCORE_X = "undefined"; const RESOURCE_SCORE_Y = "undefined"; const RESOURCE_SCORE_Z = "undefined";'}
+
+{"const RESOURCE_SCORE = 'undefined';" if config.level in ["advance", "advanced"] else f"import {{ RESOURCE_SCORE }} from 'arena/season_{config.season}/collect_and_control/basic';"}
         """,
         const.ARENA_GRAY: lambda: f"""
 class GameBodyPart{{
@@ -326,7 +322,7 @@ class Compiler_Utils(Compiler_Const):
         return '\n'.join(result)  # 将处理后的所有代码行连接成一个字符串，并返回最终结果 | join all processed lines into a string and return
 
     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
         PY_IMPORT_PAT: re.compile(r'\s+from\s+(.+)(?=\s+import)\s+import\s+\*')
         :param fpath: str 目标文件路径 | target file path
@@ -384,6 +380,81 @@ class Compiler_Utils(Compiler_Const):
 
         return imps
 
+    def find_chain_import2(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
+        PY_IMPORT_PAT: re.compile(r'\s+from\s+(.+)(?=\s+import)\s+import\s+\*')
+        :param fpath: str 目标文件路径 | target file path
+        :param search_dirs: list[str] 搜索目录 | search directories
+        :param project_path=None: str python项目中的概念，指根文件所在的目录。如果不指定，默认使用第一次调用时给定的fpath，并且稍后的递归会全部使用此路径 |
+            concept in python-project, refers to the directory where the root file is located. If not specified, the fpath given at the first call is used by default, and all subsequent recursions will use this path
+        :param records=None: dict[str, None] 记录已经查找过的文件路径，避免重复查找 | record the file paths that have been searched to avoid duplicate searches
+        """
+        if records is None:
+            records = {}
+        if not os.path.exists(fpath):
+            core.error('Compiler.find_chain_import', core.lformat(LOC_FILE_NOT_EXISTS, [fpath]), head='\n', ln=config.language)
+        imps = []
+        content = self.auto_read(fpath)
+        project_path = project_path or os.path.dirname(fpath)
+
+        # 添加根目录和 src 目录到 search_dirs
+        root_dir = os.path.dirname(project_path)  # 根目录
+        src_dir = os.path.join(root_dir, 'src')  # src 目录
+        if root_dir not in search_dirs:
+            search_dirs = [root_dir] + search_dirs
+        if src_dir not in search_dirs:
+            search_dirs = [src_dir] + search_dirs
+
+        for no, line in enumerate(content.split('\n')):
+            m = self.PY_IMPORT_PAT.match(line)
+            if m:
+                target = m.group(1)
+                target_path = project_path
+
+                ## 向前定位 | locate forward
+                if target.startswith('.'):
+                    target_path = os.path.dirname(fpath)  # 因为使用了相对路径，所以需要先定位到当前文件所在的目录 |
+                    # because relative path is used, need to locate the directory where the current file is located first
+                    count = 0
+                    for c in target:
+                        if c == '.':
+                            count += 1
+                        else:
+                            break
+                    if count > 1:
+                        for _ in range(count - 1):
+                            target_path = os.path.dirname(target_path)
+
+                ## 向后定位 | locate backward
+                while (_idx := target.find('.')) != -1:
+                    first_name = target[:_idx]
+                    target_path = os.path.join(target_path, first_name)
+                    target = target[_idx + 1:]
+
+                ## 检查是否存在 | check if exists
+                this_path = os.path.join(target_path, target)
+                if os.path.isdir(this_path):
+                    this_path = os.path.join(this_path, '__init__.py')
+                else:
+                    this_path += '.py'
+
+                if not os.path.exists(this_path):
+                    # 如果当前路径不存在，尝试在 search_dirs 中查找
+                    for search_dir in search_dirs:
+                        search_path = os.path.join(search_dir, target.replace('.', os.sep)) + ('.py' if not os.path.isdir(this_path) else os.sep + '__init__.py')
+                        if os.path.exists(search_path):
+                            this_path = search_path
+                            break
+                    else:
+                        core.error('Compiler.find_chain_import', core.lformat(LOC_CHAIN_FILE_NOT_EXISTS, [fpath, no + 1, this_path]), head='\n', ln=config.language)
+                if this_path not in records:
+                    records[this_path] = None
+                    tmp = self.find_chain_import(this_path, search_dirs, project_path, records) + [this_path]
+                    imps.extend(tmp)
+
+        return imps
+
     @staticmethod
     def relist_pyimports_to_jsimports(base_dir:str, pyimps:list[str]) -> list[str]:
         """
@@ -402,7 +473,7 @@ class Compiler_Utils(Compiler_Const):
     # ---------- 自定义函数 ---------- #
     @staticmethod
     def stage_recursive_replace(content:str) -> str:
-        """
+        r"""
         替换'@recursive'为'@recursive(<fname>)', 其中<fname>为被装饰器标记的函数名 |
             Replace '@recursive' with '@recursive(<fname>)', where <fname> is the name of the decorated function.
 
@@ -414,7 +485,9 @@ class Compiler_Utils(Compiler_Const):
 
 class CompilerBase(Compiler_Utils):
 
-    def __init__(self, src_dir, build_dir):
+    def __init__(self):
+        src_dir = "src"
+        build_dir = "build"
         # check
         if not os.path.exists(src_dir):
             core.error('Compiler.__init__', core.lformat(LOC_FILE_NOT_EXISTS, ['src', src_dir]), head='\n', ln=config.language)

{pyscreeps-arena-0.4a2 → pyscreeps-arena-0.4a3}/pyscreeps_arena.egg-info/PKG-INFO

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

{pyscreeps-arena-0.4a2 → pyscreeps-arena-0.4a3}/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.4a2',
+    version='0.4a3',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',