pyscreeps-arena 0.3a0__py3-none-any.whl → 0.3a2__py3-none-any.whl

pyscreeps_arena/compiler.py

@@ -12,9 +12,9 @@ from colorama import Fore
 
 WAIT = Fore.YELLOW + ">>>" + Fore.RESET
 GREEN = Fore.GREEN + "{}" + Fore.RESET
-version_info = sys.version_info
-python_version_cn = f"Python版本: {version_info.major}.{version_info.minor}.{version_info.micro}"
-python_version_en = f"Compiler py-version: {version_info.major}.{version_info.minor}.{version_info.micro}"
+python_version_info = sys.version_info
+python_version_info = f"{python_version_info.major}.{python_version_info.minor}.{python_version_info.micro}"
+
 
 # def InsertPragmaBefore(content:str) -> str:
 #     """
@@ -32,7 +32,7 @@ class Compiler_Const:
             "!=": "!==",
         }
     }
-    PYFILE_IGNORE_CHECK_FNAMES = ['game/const.py', 'game/proto.py', 'game/utils.py']
+    PYFILE_IGNORE_CHECK_FNAMES = ['builtin/const.py', 'builtin/proto.py', 'builtin/utils.py']
 
     PYFILE_PRAGMA_INSERTS = """
     # __pragma__('noalias', 'undefined')
@@ -42,12 +42,35 @@ class Compiler_Const:
     """
 
     TOTAL_INSERT_AT_HEAD = """
-    import {arenaInfo} from "game";
+import { createConstructionSite, findClosestByPath, findClosestByRange, findInRange, findPath, getCpuTime, getDirection, getHeapStatistics, getObjectById, getObjects, getObjectsByPrototype, getRange, getTerrainAt, getTicks,} from 'game/utils';
+import { ConstructionSite, Creep, GameObject, OwnedStructure, Resource, Source, Structure, StructureContainer, StructureExtension, StructureRampart, StructureRoad, StructureSpawn, StructureTower, StructureWall,} from 'game/prototypes';
+import { ATTACK, ATTACK_POWER, BODYPART_COST, BODYPART_HITS, BOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT, BUILD_POWER, CARRY, CARRY_CAPACITY, CONSTRUCTION_COST, CONSTRUCTION_COST_ROAD_SWAMP_RATIO, CONSTRUCTION_COST_ROAD_WALL_RATIO, CONTAINER_CAPACITY, CONTAINER_HITS, CREEP_SPAWN_TIME, DISMANTLE_COST, DISMANTLE_POWER, ERR_BUSY, ERR_FULL, ERR_INVALID_ARGS, ERR_INVALID_TARGET, ERR_NAME_EXISTS, ERR_NOT_ENOUGH_ENERGY, ERR_NOT_ENOUGH_EXTENSIONS, ERR_NOT_ENOUGH_RESOURCES, ERR_NOT_FOUND, ERR_NOT_IN_RANGE, ERR_NOT_OWNER, ERR_NO_BODYPART, ERR_NO_PATH, ERR_TIRED, EXTENSION_ENERGY_CAPACITY, EXTENSION_HITS, HARVEST_POWER, HEAL, HEAL_POWER, LEFT, MAX_CONSTRUCTION_SITES, MAX_CREEP_SIZE, MOVE, OBSTACLE_OBJECT_TYPES, OK, RAMPART_HITS, RAMPART_HITS_MAX, RANGED_ATTACK, RANGED_ATTACK_DISTANCE_RATE, RANGED_ATTACK_POWER, RANGED_HEAL_POWER, REPAIR_COST, REPAIR_POWER, RESOURCES_ALL, RESOURCE_DECAY, RESOURCE_ENERGY, RIGHT, ROAD_HITS, ROAD_WEAROUT, SOURCE_ENERGY_REGEN, SPAWN_ENERGY_CAPACITY, SPAWN_HITS, STRUCTURE_PROTOTYPES, TERRAIN_PLAIN, TERRAIN_SWAMP, TERRAIN_WALL, TOP, TOP_LEFT, TOP_RIGHT, TOUGH, TOWER_CAPACITY, TOWER_COOLDOWN, TOWER_ENERGY_COST, TOWER_FALLOFF, TOWER_FALLOFF_RANGE, TOWER_HITS, TOWER_OPTIMAL_RANGE, TOWER_POWER_ATTACK, TOWER_POWER_HEAL, TOWER_POWER_REPAIR, TOWER_RANGE, WALL_HITS, WALL_HITS_MAX, WORK} from 'game/constants';
+
+import {arenaInfo} from "game";
+import {Visual} from "game/visual"
+import {searchPath} from "game/path-finder"
     """
 
     TOTAL_INSERT_BEFORE_MAIN = """
     """
 
+    TOTAL_APPEND_ATEND = """
+export var sch = Scheduler();
+    
+know.now = 0;
+export var loop = function () {
+	know.now = get.ticks ();
+	if (know.now === 1) {
+		init (know);
+	}
+	
+    know.update_(know);
+	step (know);
+	sch.handle();
+	std.show_usage ();
+};
+    """
+
     TOTAL_SIMPLE_REPLACE_WITH = {
     }
 
@@ -67,34 +90,12 @@ class Compiler_Const:
 
     JS_VM = "org.transcrypt.__runtime__.js"
 
-    GAME_UTILS = './builtin.utils.js'
-    GAME_PROTO = './builtin.proto.js'
-    GAME_CONST = './builtin.const.js'
     BUILTIN_TRANS = ["engine.js"]
     OTHER_IGNORE_WITH = "./builtin"
 
-    SYSTEM_MODULES_IGNORE = {
-        GAME_UTILS: ['CircleVisualStyle', 'Color', 'CostMatrix', 'CreateConstructionSiteResult', 'Direction', 'DoesZapCodeSpaceFlag',
-                     'FindPathOptions', 'Goal', 'HeapInfo',
-                     'LineStyle', 'LineVisualStyle', 'PolyVisualStyle', 'RectVisualStyle', 'SearchPathOptions', 'SearchPathResult', 'Terrain',
-                     'TextAlign', 'TextVisualStyle',
-                     'Visual', 'getAt', 'searchPath'],
-        GAME_PROTO: ['BodyPartType', 'CreepAttackResult', 'CreepBuildResult', 'CreepDropResult', 'CreepHarvestResult', 'CreepHealResult',
-                     'CreepMoveResult', 'CreepPickupResult',
-                     'CreepPullResult', 'CreepRangedAttackResult', 'CreepRangedHealResult', 'CreepRangedMassAttackResult',
-                     'CreepTransferResult', 'CreepWithdrawResult',
-                     'ResourceType', 'SpawnCreepResult', 'Store', 'TowerAttackResult', 'TowerHealResult', 'Spawning', 'ScoreController',
-                     'Flag', 'Position'],
-        GAME_CONST: ['RESOURCE_SCORE'],
-    }
-    SYSTEM_MODULES_TRANSNAME = {  # 对应的在js中的名字 | Corresponding name in js
-        GAME_UTILS: "game/utils",
-        GAME_PROTO: "game/prototypes",
-        GAME_CONST: "game/constants",
-    }
-    GENERATE_IGNORE_PYFILES = ['config.py']  # Won't be compiled into the final js code, only for defines.
-
     JS_IMPORT_PAT = re.compile(r'from\s+[\'\"]([^\']+)[\'\"]')
+    JS_EXPORT_PAT = re.compile(r'export\s+{([^}]+)}')
+    PY_IMPORT_PAT = re.compile(r'from\s+(.+)(?=\s+import)\s+import\s+\*')
     INSERT_PAT = re.compile(r'#\s*insert\s+([^\n]*)')  # 因为被判定的string为单line，所以不需要考虑多行的情况
 
     TRANSCRYPT_ERROR_REPLACE = {
@@ -102,6 +103,25 @@ class Compiler_Const:
         r"new\s+set\s*\(": r"set(",
     }
 
+    ARENA_IMPORTS_GETTER = {
+        const.ARENA_GREEN: lambda: f"""
+        
+        """,
+        const.ARENA_BLUE: lambda: f"""
+import {{ Flag, StructureTower }} from 'arena/season_{config.season}/capture_the_flag/basic';
+        """,
+        const.ARENA_RED: lambda: f"""
+import {{ RESOURCE_SCORE, RESOURCE_SCORE_X, RESOURCE_SCORE_Y, RESOURCE_SCORE_Z, ScoreCollector, AreaEffect, EFFECT_DAMAGE, EFFECT_FREEZE }} from 'arena/season_{config.season}/collect_and_control/basic';
+        """,
+        const.ARENA_GRAY: lambda: f"""
+// import {{ Flag }} from 'game/prototypes'
+import("game/prototypes")
+.then((module) => {{ const Flag = module.Flag; }})
+.catch((error) => {{ }});
+        """,
+    }
+
+
 class Compiler_Utils(Compiler_Const):
     last_output = False  # 一个小标志位，我只想输出一次此类告警信息
 
@@ -134,7 +154,6 @@ class Compiler_Utils(Compiler_Const):
                 with open(fpath, 'r', encoding=encoding) as f:  # 使用检测到的编码打开文件
                     return f.read()
 
-
     def copy_to(self) -> list:
         """
         复制src到build目录 | copy all files in src to build
@@ -149,6 +168,7 @@ class Compiler_Utils(Compiler_Const):
         if os.path.exists(self.build_dir):
             shutil.rmtree(self.build_dir)
         shutil.copytree(self.src_dir, self.build_dir)
+        shutil.copytree(self.src_dir, os.path.join(self.build_dir, "src"))
         srcs = []  # src下所有python文件的路径 | paths of all python files under src
         for root, dirs, files in os.walk(self.build_dir):
             for file in files:
@@ -165,7 +185,7 @@ class Compiler_Utils(Compiler_Const):
         return srcs
 
     @staticmethod
-    def potential_check(fpath:str, fname:str) -> bool:
+    def potential_check(fpath: str, fname: str) -> bool:
         """
         检查某个py文件内是否有潜在问题 | check if there are potential problems in a py file
 
@@ -175,8 +195,8 @@ class Compiler_Utils(Compiler_Const):
             bool: 是否有警告
         """
         # 文件路径检查
-        if fpath.endswith('__init__.py') and fpath.find("builtin") == -1:
-            core.error("potential_check", LOC_NOT_SUPPORT_PYFILE_INIT, ln=config.language, ecode=-1, head='\n')
+        # if fpath.endswith('__init__.py') and fpath.find("builtin") == -1:
+        #     core.error("potential_check", LOC_NOT_SUPPORT_PYFILE_INIT, ln=config.language, ecode=-1, head='\n')
         if fname in Compiler.PYFILE_IGNORE_CHECK_FNAMES:
             return False
 
@@ -212,10 +232,10 @@ class Compiler_Utils(Compiler_Const):
         for i, line in enumerate(lines):  # 遍历源代码的每一行 | iterate over each line of source code
             striped = line.strip()  # 去掉行首尾的空格和换行符 | strip leading and trailing whitespace
             # 使用正则表达式匹配不同的条件语句 | use regex to match different conditional statements
-            if_match = re.match(r'#\s*>\s*if\s+([^:.]*)$', striped)         # 匹配 '# > if' 语句 | match '# > if' statement
-            elif_match = re.match(r'#\s*>\s*elif\s+([^:.]*)$', striped)     # 匹配 '# > elif' 语句 | match '# > elif' statement
-            else_match = re.match(r'#\s*>\s*else$', striped)                # 匹配 '# > else' 语句 | match '# > else' statement
-            endif_match = re.match(r'#\s*>\s*endif$', striped)              # 匹配 '# > endif' 语句 | match '# > endif' statement
+            if_match = re.match(r'#\s*>\s*if\s+([^:.]*)$', striped)  # 匹配 '# > if' 语句 | match '# > if' statement
+            elif_match = re.match(r'#\s*>\s*elif\s+([^:.]*)$', striped)  # 匹配 '# > elif' 语句 | match '# > elif' statement
+            else_match = re.match(r'#\s*>\s*else$', striped)  # 匹配 '# > else' 语句 | match '# > else' statement
+            endif_match = re.match(r'#\s*>\s*endif$', striped)  # 匹配 '# > endif' 语句 | match '# > endif' statement
 
             if if_match:  # 如果当前行是 '# > if' 语句 | if it's a '# > if' statement
                 condition = if_match.group(1)  # 提取条件表达式 | extract the condition expression
@@ -233,6 +253,80 @@ 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]:
+        """
+        查找文件中的所有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)
+        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):
+                    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]:
+        """
+        将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('/')
+            if rel_path_nodes[-1] == '__init__.py':
+                rel_path_nodes.pop()
+            else:
+                rel_path_nodes[-1] = rel_path_nodes[-1][:-3]
+            jsimps.append('./' + '.'.join(rel_path_nodes) + '.js')
+        return jsimps
+
 
 class CompilerBase(Compiler_Utils):
 
@@ -259,7 +353,6 @@ class CompilerBase(Compiler_Utils):
         self.target_dir = os.path.join(self.build_dir, '__target__')
         self.build_name = os.path.basename(self.build_dir)
 
-
     @property
     def builtin_py(self) -> str:
         """
@@ -282,13 +375,13 @@ class CompilerBase(Compiler_Utils):
         return os.path.join(self.target_dir, 'main.js')
 
 
-
 class Compiler(CompilerBase):
     def pre_compile(self):
         """
         预编译 | Precompile
         """
-        src_paths = self.copy_to()
+        src_paths: list[str] = self.copy_to()  # 复制src到build目录 | copy all files in src to build
+        # 获取src目录下的所有.py文件的路径 | get the paths of all .py files under src
 
         core.lprint(WAIT, LOC_PREPROCESSING, end="", ln=config.language)
         py_fpath, py_names, warn_flag = [], [], False
@@ -300,9 +393,7 @@ class Compiler(CompilerBase):
                     # 将PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "")插入到文件开头
                     content = self.auto_read(fpath)
                     content = self.PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "") + content
-                    # 如果是main.py，则将self.built_dir下的__init__.py文件内容插入到main.py文件开头
-                    if fpath == self.target_py:
-                        content = self.auto_read(self.builtin_py) + content
+
                     with open(fpath, 'w', encoding='utf-8') as f:  # 注意，这里修改的是build目录下的文件，不是源文件 | Note that the file under the build directory is modified here, not the source file
                         f.write(content)
 
@@ -316,42 +407,28 @@ class Compiler(CompilerBase):
 
         _usubs_ = []  # update_subclass
         _pre_import_, _pre_imp_detail_ = [], {}  # > import
+        _imports = []  # chain import
         _pre_sort_ = {}  # > sort
         _pre_define_ = {}  # > define
         _js_replace_, _insert_id_ = {}, 0  # > insert
 
-
-        # ---------------------------------- UPDATABLE ---------------------------------- #
-        # 获取在src目录内定义的所有继承了Updatable或CreepLogic的类 |
-        # get all classes that inherit from Updatable or CreepLogic defined in the src directory
-        for i, fpath in enumerate(py_fpath):
-            if fpath in src_paths:
-                content = self.auto_read(fpath)
-                for line in content.split('\n'):
-                    m = re.search(r'class\s+([^\s(]+)\s*\((Updatable|CreepLogic)', line)
-                    if m:
-                        _usubs_.append(m.group(1))
-
-        # change REPALCE: '/// $UPDATABLE.UPDATES$ ///'
-        _rp_key = "/// $UPDATABLE.UPDATES$ ///"
-        _rp_txt = ""
-        for usub in _usubs_:
-            _rp_txt += "try{" + f"if ({usub} && !Updatable.UPDATES.includes({usub}))Updatable.UPDATES.append({usub});"  + "}catch(e){ if (!(e instanceof ReferenceError)) throw e; }\n"
-        self.TOTAL_SIMPLE_REPLACE_WITH[_rp_key] = _rp_txt
-
-
-        # ----------------------------------- IMPORT ----------------------------------- #
-        # 获取所有.py文件中的所有import的内容，并记录下来fname:[imp1, imp2, ...]
-        # | get all import in .py files, and record them fname:[imp1, imp2, ...]
+        # -------------------------------- ONLY IMPORT * -------------------------------- #
+        # 只允许from xxx import *的情况 | only allow from xxx import *
         for i, fpath in enumerate(py_fpath):
-            fname = py_names[i][:-3] + '.js'
             content = self.auto_read(fpath)
-            for i, line in enumerate(content.split('\n')):
-                m = re.search(r'#\s*>\s*import\s+([^\n]+)', line)
+            for line in content.split('\n'):
+                # 1. 检查 import xxx的情况 | check import xxx
+                m = re.match(r'\s*import\s+([^\s]+)', line)
                 if m:
-                    _pre_import_.append('./' + re.sub(r'\s', '', m.group(1)) + '.js')
-                    # 记录文件/lineio信息
-                    _pre_imp_detail_[_pre_import_[-1]] = f'{fname}/line:{i + 1}'
+                    core.error('Compiler.pre_compile', core.lformat(LOC_IMPORT_STAR_ERROR, [m.group(1), m.group(1)]), head='\n', ln=config.language)
+                # 2. 检查 from xxx import yyys的情况(yyys不能是*) | check from xxx import yyys(yyys can't be *)
+                m = re.match(r'\n\s*from\s+([^\s]+)\s+import\s+([^\s]+)', line)
+                if m and (not m.group(2) or m.group(2)[0] != '*'):
+                    core.error('Compiler.pre_compile', core.lformat(LOC_IMPORT_STAR2_ERROR, [m.group(1), m.group(2), m.group(1)]), head='\n', ln=config.language)
+
+        # -------------------------------- EXPAND IMPORT * -------------------------------- #
+        _imports = self.find_chain_import(self.target_py, [os.path.dirname(self.src_dir), self.src_dir])
+        _js_imports = self.relist_pyimports_to_jsimports(self.build_dir, _imports)
 
         # ----------------------------------- REMOVE ----------------------------------- #
         # 移除所有# > remove所在行的内容
@@ -370,7 +447,11 @@ class Compiler(CompilerBase):
         # 获取所有.py文件中的所有# > sort的内容，并记录下来(不存在则默认为65535)
         # | get all # > sort in .py files, and record them (default 65535 if not exists)
         for i, fpath in enumerate(py_fpath):
-            fname = py_names[i][:-3] + '.js'
+            fname = py_names[i]
+            if fname.endswith('__init__.py'):
+                fname = fname[:-12] + '.js'
+            else:
+                fname = fname[:-3] + '.js'
             content = self.auto_read(fpath)
             m = re.search(r'#\s*>\s*sort\s+(\d+)', content)
             if m:
@@ -416,11 +497,6 @@ class Compiler(CompilerBase):
         for fpath in py_fpath:
             content = self.auto_read(fpath)
 
-            # std.py PYSCREEPS_ARENA_PYTHON_VERSION replace
-            if os.path.basename(fpath).lower() == 'std.py':
-                content = content.replace('PYSCREEPS_ARENA_PYTHON_VERSION_EN', f'\"{python_version_en}\"')
-                content = content.replace('PYSCREEPS_ARENA_PYTHON_VERSION_CN', f'\"{python_version_cn}\"')
-
             for key in _def_keys:
                 content = re.sub(r'[^_A-Za-z0-9]' + key, self._kfc_wrapper(_pre_define_[key]), content)
 
@@ -462,18 +538,7 @@ class Compiler(CompilerBase):
                 f.write(new_content)
 
         core.lprint(GREEN.format('[2/6]'), LOC_DONE, " ", LOC_PREPROCESSING_FINISH, sep="", head="\r", ln=config.language)
-        return _pre_import_, _pre_imp_detail_, _pre_sort_, _pre_define_, _js_replace_
-
-    def clear_not_generate_pyfile(self):
-        """
-        清空不需要编译的py文件 | clear not generate py file
-        :return:
-        """
-        for root, dirs, files in os.walk(self.build_dir):
-            for file in files:
-                if file.endswith('.py') and file in self.GENERATE_IGNORE_PYFILES:
-                    with open(os.path.join(root, file), 'w', encoding='utf-8') as f:
-                        f.write('')
+        return _imports, _js_imports, _pre_sort_, _pre_define_, _js_replace_
 
     def transcrypt_cmd(self):
         # 执行cmd命令: transcrypt -b -m -n -s -e 6 target | execute cmd: transcrypt -b -m -n -s -e 6 target
@@ -497,7 +562,7 @@ class Compiler(CompilerBase):
         return '{' if matched.group(0)[0] == '{' else ''
 
     @staticmethod
-    def _keep_first_char(matched:re.Match) -> str:
+    def _keep_first_char(matched: re.Match) -> str:
         """
         保留第一个字符 | keep the first char
         :param matched: re.match object | re.match对象
@@ -506,7 +571,7 @@ class Compiler(CompilerBase):
         return matched.group(0)[0]
 
     @staticmethod
-    def _kfc_wrapper(replace:str) -> callable:
+    def _kfc_wrapper(replace: str) -> callable:
         """
         获取一个保留第一个字符的函数 | get a function to keep the first char
         :param replace: str
@@ -518,7 +583,7 @@ class Compiler(CompilerBase):
 
         return _kfc
 
-    def analyze_rebuild_main_js(self, defs:dict[str, object]) -> tuple[str, list[str]]:
+    def analyze_rebuild_main_js(self, defs: dict[str, object], modules=None) -> tuple[str, list[str]]:
         """
         分析main.js中导入的模块名称和先后顺序, 并重新生成main.js | analyze the module names and order imported in main.js, and rebuild main.js
         * 主要移除非SYSTEM_MODULES_IGNORE中的模块导入语句 | mainly remove the module import statements that are not in SYSTEM_MODULES_IGNORE
@@ -532,16 +597,17 @@ class Compiler(CompilerBase):
         # create undefined
         imports = ""
 
-        if defs.get('USE_TUTORIAL_FLAG', '0') == '0' and defs.get('USE_ARENA_FLAG', '0') == '0':
-            imports += 'var Flag = undefined;\n'
-        if defs.get('USE_SCORE_COLLECTOR', '0') == '0':
-            imports += 'var ScoreController = undefined;\nvar RESOURCE_SCORE = undefined;\n'
-        imports += '\n'
+        # if defs.get('USE_TUTORIAL_FLAG', '0') == '0' and defs.get('USE_ARENA_FLAG', '0') == '0':
+        #     imports += 'var Flag = undefined;\n'
+        # if defs.get('USE_SCORE_COLLECTOR', '0') == '0':
+        #     imports += 'var ScoreController = undefined;\nvar RESOURCE_SCORE = undefined;\n'
+        # imports += '\n'
 
         core.lprint(WAIT, LOC_ANALYZING_AND_REBUILDING_MAIN_JS, end="", ln=config.language)
 
         content = self.auto_read(self.target_js)
-        modules, new_content = [], ""
+        if modules is None: modules = []
+        new_modules, new_content = [],""
         for line in content.split('\n'):
             m = re.search(self.JS_IMPORT_PAT, line)
             if not m:
@@ -549,22 +615,22 @@ class Compiler(CompilerBase):
                 continue
             # remove ignore if in SYSTEM_MODULES_IGNORE
             module = m.group(1)
-            for ignore in self.SYSTEM_MODULES_IGNORE.get(module, []):
-                line = re.sub(r'[\s{]' + ignore + ',?', self._keep_lbracket, line)
-
-            # do not add in modules if in system_modules_ignores
-            if module in self.SYSTEM_MODULES_IGNORE:
-                if module in self.SYSTEM_MODULES_TRANSNAME:
-                    line = line.replace(module, self.SYSTEM_MODULES_TRANSNAME[module])  # 调整为js中的名称
-                imports += line + '\n'
-                continue
 
             _ignore = False
             if module in modules: _ignore = True
+            if module in new_modules: _ignore = True
+            if not _ignore: new_modules.append(module)
+
+        # conbine modules
+        modules = new_modules + modules
+        new_modules = []
+        for module in modules:
+            _ignore = False
             if not _ignore and module.startswith(self.OTHER_IGNORE_WITH): _ignore = True
             for keeps in self.BUILTIN_TRANS:
                 if module.endswith(keeps): _ignore = False
-            if not _ignore: modules.append(module)
+            if not _ignore: new_modules.append(module)
+        modules = new_modules
 
         # save raw main.js
         with open(self.target_js[:-3] + ".raw.js", 'w', encoding='utf-8') as f:
@@ -587,7 +653,7 @@ class Compiler(CompilerBase):
         """
         return re.sub(r'import[^\n]*\n', '', raw)
 
-    def generate_total_js(self, usr_modules, t_imps: dict, f_sorts, f_replaces, g_replaces) -> str:
+    def generate_total_js(self, usr_modules, t_imps: list[str], f_sorts, f_replaces, g_replaces) -> str:
         """
         生成总的main.js
         按照如下顺序组合:
@@ -597,31 +663,23 @@ class Compiler(CompilerBase):
             ./game.utils.js  # IGNORE
             {usr_modules}
         :param usr_modules: list[str]  # js vm + 用户自定义模块
-        :param t_imps: dict{module_name: detail}
+        :param t_imps: list[str]  # main前需要导入的模块
         :param f_sorts: dict{module_name: sort_priority}
         :param f_replaces: dict{module_name: dict{old: new}}
         :param g_replaces: dict{old: new}
         :return: str
         """
-        total_js = "" + self.TOTAL_INSERT_AT_HEAD
+        arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES['green'])  # like green -> spawn_and_swamp
+        self.TOTAL_INSERT_AT_HEAD += self.ARENA_IMPORTS_GETTER[arena_name]()  # add arena imports
+        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"
 
         core.lprint(WAIT, LOC_GENERATING_TOTAL_MAIN_JS, end="", ln=config.language)
 
+        # TODO: IMPS donot work
+
         # resort modules
         f_sorts[self.JS_VM] = -1
 
-        err_flag = False
-        for module in usr_modules:
-            if module[2:] not in f_sorts:
-                print(Fore.RED + '\n[Error] ' + Fore.RESET + f'"{module[2:-3]}.py" is not a user module.')
-                imp_detail = t_imps.get(module, None)
-                if imp_detail:
-                    print("\t\t-- May be imported by user in: %s" % imp_detail)
-                else:
-                    print("\t\t-- Please move this file into the 'src' directory.")
-                err_flag = True
-        if err_flag:
-            sys.exit(1)
         for i in range(len(usr_modules)):
             for j in range(i + 1, len(usr_modules)):
                 if f_sorts[usr_modules[i][2:]] > f_sorts[usr_modules[j][2:]]:
@@ -639,7 +697,6 @@ class Compiler(CompilerBase):
             total_js += "----------------------------------------\n\n"
             total_js += content + '\n'
 
-
         total_js += self.TOTAL_INSERT_BEFORE_MAIN
 
         # write main.js
@@ -648,6 +705,12 @@ class Compiler(CompilerBase):
             content = re.sub(old, new, content)
         total_js += content
 
+        # TOTAL_APPEND_ATEND
+        total_js += self.TOTAL_APPEND_ATEND
+
+        # replace export-pat
+        total_js = re.sub(self.JS_EXPORT_PAT, "", total_js)
+
         # global replace
         for old, new in g_replaces.items():
             total_js = re.sub(old, new, total_js)
@@ -672,7 +735,6 @@ class Compiler(CompilerBase):
             return int(m.group(1))
         return 65535
 
-
     def find_add_pure_js_files(self, sorts, modules):
         """
         找到所有的纯js文件，并添加到modules中
@@ -690,31 +752,24 @@ class Compiler(CompilerBase):
                     sorts[fname] = self.__parse_js_file_sort(fpath)
                     modules.append("./" + fname)
 
-    def compile(self, export_to=None, paste=False):
+    def compile(self, paste=False):
         """
         编译
-        :param export_to: 指定main.mjs的输出路径(/main.mjs)
         :param paste: 是否复制到剪贴板
         :return:
         """
-        imps, imp_ts, sorts, defs, reps = self.pre_compile()
-        self.clear_not_generate_pyfile()  # 清空不需要编译的py文件(请确保在pre_compile之后)
+        imps, jimps, sorts, defs, reps = self.pre_compile()
         self.transcrypt_cmd()
-        imports, modules = self.analyze_rebuild_main_js(defs)
+        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(list(set(modules + imps)), imp_ts, sorts, self.FILE_STRONG_REPLACE, reps)
+        total_js = imports + "\n" + self.generate_total_js(modules, imps, sorts, self.FILE_STRONG_REPLACE, reps)
 
         core.lprint(WAIT, LOC_EXPORTING_TOTAL_MAIN_JS, end="", ln=config.language)
 
         # ensure exported main.mjs path
         build_main_mjs = os.path.join(self.build_dir, 'main.mjs')
 
-        if not export_to:
-            # 尝试读取defs
-            mjs_path = defs.get('MAIN_JS_PATH', build_main_mjs)
-        else:
-            mjs_path = export_to
-
+        mjs_path = config.target if config.target is not None else config.TARGET_GETTER()
         if not mjs_path.endswith('js'):
             mjs_path = os.path.join(mjs_path, 'main.mjs')
 

pyscreeps_arena/core/config.py

@@ -7,7 +7,12 @@
 # .2025 01 01 - v0.1:
 #   Created.
 #
-
+import os
 from pyscreeps_arena.core import const
-
+arena = "green"
+season = "beta"
 language = 'cn'
+# 默认路径: 用户 + ScreepsArena + beta-spawn_and_swamp + main.mjs
+target = None
+TARGET_GETTER = lambda: os.path.join(os.path.expanduser('~'), 'ScreepsArena', f'{season}-{const.ARENA_NAMES.get(arena, "spawn_and_swamp")}', 'main.mjs')
+

pyscreeps_arena/core/const.py

@@ -9,8 +9,19 @@
 #
 import re
 
-VERSION = "0.1"
+VERSION = "0.3a2"
 AUTHOR = "我阅读理解一直可以的"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"
 
+ARENA_GREEN = "spawn_and_swamp"
+ARENA_BLUE = "capture_the_flag"
+ARENA_RED = "collect_and_control"
+ARENA_GRAY = "tutorial"
+
+ARENA_NAMES = {
+    "green": ARENA_GREEN,
+    "blue" : ARENA_BLUE,
+    "red"  : ARENA_RED,
+    "gray" : ARENA_GRAY,
+}

pyscreeps_arena/localization.py

@@ -25,6 +25,18 @@ LOC_PREPROCESSING_FINISH = {
     'en': "Preprocessing finished.",
     'cn': "预处理完成。",
 }
+LOC_IMPORT_STAR_ERROR = {
+    'en': "Only 'from xxx import *' is allowed, but found 'import {}'." + Fore.LIGHTBLUE_EX + "Maybe you can use 'from {} import *' instead." + Fore.RESET,
+    'cn': "只允许'from xxx import *'，但是发现了'import {}'。" + Fore.LIGHTBLUE_EX + "也许你可以使用'from {} import *'代替之。" + Fore.RESET,
+}
+LOC_IMPORT_STAR2_ERROR = {
+    'en': "Only 'from xxx import *' is allowed, but found 'from {} import {}'." + Fore.LIGHTBLUE_EX + "Maybe you can use 'from {} import *' instead." + Fore.RESET,
+    'cn': "只允许'from xxx import *'，但是发现了'from {} import {}'。 " + Fore.LIGHTBLUE_EX + "也许你可以使用'from {} import *'代替之。" + Fore.RESET,
+}
+LOC_CHAIN_FILE_NOT_EXISTS = {
+    'en': "During search chain-import at {}, lineno {}:\n\tfile not exists: {}",
+    'cn': "在搜索链式导入时，位于 {}，行号 {}:\n\t文件不存在: {}",
+}
 LOC_TRANSCRYPTING = {
     'en': "Transcrypting ... # cmd:{}",
     'cn': "转译中 ... # cmd命令:{}",

{pyscreeps_arena-0.3a0.dist-info → pyscreeps_arena-0.3a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyscreeps-arena
-Version: 0.3a0
+Version: 0.3a2
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pyperclip
 Requires-Dist: colorama
 Requires-Dist: py7zr
+Requires-Dist: chardet
 Requires-Dist: Transcrypt ==3.9.3
 Requires-Dist: mkdocs
 Requires-Dist: mkdocstrings[python]

pyscreeps_arena-0.3a2.dist-info/RECORD

@@ -0,0 +1,17 @@
+pyscreeps_arena/__init__.py,sha256=3O7Oa_IofW8YQYsnrU88SGYNxn-CMR-PpmV8P2hhEhc,800
+pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
+pyscreeps_arena/compiler.py,sha256=tM6LZkQVIaLRAGzpU33t0QksJhOq9ghlQiG1y6N77VA,41251
+pyscreeps_arena/localization.py,sha256=gBbrNybIJAHlkzeD6maF-ie6RKSwPBbnCNzg_1ge8-c,5656
+pyscreeps_arena/project.7z,sha256=NAY1brX7-Y78s-YUkJEcVh4D5MXuDmSGkEfyRuzdJhw,55542
+pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
+pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
+pyscreeps_arena/core/config.py,sha256=7GXJ82BgXwaZK6H5RHNqovAS5q4HQvl4hL_7-cBWOio,518
+pyscreeps_arena/core/const.py,sha256=eCWbMSZiyWmGaq2qjslzH_7RN8SOkJGkvI8CyPoVlsE,552
+pyscreeps_arena/core/core.py,sha256=3Nty8eLKPNgwnYk_sVNBPrWuKxBXI2od8nfEezsEAZQ,5157
+pyscreeps_arena/core/main.py,sha256=-FNSOEjksNlDfCbUqsjtPSUW8vT3qxEdfzXqT5Tdsik,170
+pyscreeps_arena/core/utils.py,sha256=N9OOkORvrqnJakayaFp9qyS0apWhB9lBK4xyyYkhFdo,215
+pyscreeps_arena-0.3a2.dist-info/METADATA,sha256=psowb1AqrgiA7NZ9YHhRIuLM-ds6_cdZxr6T1nAOpP0,2079
+pyscreeps_arena-0.3a2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pyscreeps_arena-0.3a2.dist-info/entry_points.txt,sha256=dqhZN327jfcNypYjEaEJ2t-ABUZ0sVhtDDrD7GiJBfo,67
+pyscreeps_arena-0.3a2.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
+pyscreeps_arena-0.3a2.dist-info/RECORD,,

pyscreeps_arena-0.3a0.dist-info/RECORD

@@ -1,17 +0,0 @@
-pyscreeps_arena/__init__.py,sha256=3O7Oa_IofW8YQYsnrU88SGYNxn-CMR-PpmV8P2hhEhc,800
-pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
-pyscreeps_arena/compiler.py,sha256=iCpiG4GqZiA4MtqfqP10IAF_LuZEyygk0sbKH4br_D0,37179
-pyscreeps_arena/localization.py,sha256=_biHwuBLVCczniQrZET88pB_V8f8TtBpe8xKQvL_e7c,4733
-pyscreeps_arena/project.7z,sha256=OYGh2AspHQ5K9pIat2rWT_W2gmzG1uiQW-osDEZkWdM,49177
-pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
-pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
-pyscreeps_arena/core/config.py,sha256=ATIWu8jdHlD0b80gsXptsI8yKeHdYNhlCMxlGlT2SfE,233
-pyscreeps_arena/core/const.py,sha256=HSZ-zodgUlK_vWGAswpK54NBTXlWZiWGWX56toEO35w,298
-pyscreeps_arena/core/core.py,sha256=3Nty8eLKPNgwnYk_sVNBPrWuKxBXI2od8nfEezsEAZQ,5157
-pyscreeps_arena/core/main.py,sha256=-FNSOEjksNlDfCbUqsjtPSUW8vT3qxEdfzXqT5Tdsik,170
-pyscreeps_arena/core/utils.py,sha256=N9OOkORvrqnJakayaFp9qyS0apWhB9lBK4xyyYkhFdo,215
-pyscreeps_arena-0.3a0.dist-info/METADATA,sha256=MFU6vrQaANq9nTT6J1gaj0DfuE939jFled_1K0s2zTg,2055
-pyscreeps_arena-0.3a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pyscreeps_arena-0.3a0.dist-info/entry_points.txt,sha256=dqhZN327jfcNypYjEaEJ2t-ABUZ0sVhtDDrD7GiJBfo,67
-pyscreeps_arena-0.3a0.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
-pyscreeps_arena-0.3a0.dist-info/RECORD,,