pyscreeps-arena 0.5.8.5__tar.gz → 0.5.9.0__tar.gz

{pyscreeps_arena-0.5.8.5 → pyscreeps_arena-0.5.9.0}/PKG-INFO

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

{pyscreeps_arena-0.5.8.5 → pyscreeps_arena-0.5.9.0}/pyscreeps_arena/compiler.py

@@ -8,6 +8,7 @@ import shutil
 import chardet
 import subprocess
 import pyperclip
+import datetime
 from colorama import Fore
 from typing import List, Optional, Tuple, Union
 
@@ -52,6 +53,7 @@ def replace_src_prefix(file_list):
 #     """
 #     return PYFILE_PRAGMA_INSERTS + "\n" + content
 class Compiler_Const:
+    CALLED_FUNCTIONS = ['behavior', 'sequence', 'selector', 'parallel', 'listen']
     PROTO_DEFINES_DIRS = ["builtin", "library"]
     FILE_STRONG_REPLACE = {
         "std": {
@@ -108,14 +110,14 @@ export var loop = function () {
     if (know.now === 1) {
 	    std.show_welcome();
 		init (know);
-		
+
 	}
 	step (know);
     timeLine = get.cpu_us();
 	if (get._SCH_FLAG) sch.handle();
 	stepCost = get.cpu_us() - timeLine;
 	std.show_usage ();
-	print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
+    print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
 	if (know.draw) know.draw();
 };
     """
@@ -648,6 +650,82 @@ class Compiler_Utils(Compiler_Const):
 
         return result
 
+    @staticmethod
+    def stage_called_replace(caller_name: str, content: str) -> str:
+        """
+        移除 '@<caller_name>(...)' 装饰器行，并在文末添加对应的 _<caller_name>Login 调用。
+
+        对于类方法: _<caller_name>Login("ClassName", "method_name", a, b, ...)
+        对于普通函数: _<caller_name>Login("", "function_name", a, b, ...)
+        """
+        calls_to_add = []
+        deletions = []
+
+        # 1. 收集所有类定义的位置和缩进
+        class_pattern = re.compile(r'^(\s*)class\s+(\w+)', re.MULTILINE)
+        classes = [(m.start(), len(m.group(1)), m.group(2))
+                   for m in class_pattern.finditer(content)]
+
+        # 2. 查找所有 @<caller_name>(...) 装饰器（支持多行参数）
+        decorator_pattern = re.compile(
+            r'^\s*@\s*' + re.escape(caller_name) + r'\s*\((.*?)\)\s*$\n?',
+            re.MULTILINE | re.DOTALL
+        )
+
+        for dec_match in decorator_pattern.finditer(content):
+            dec_start = dec_match.start()
+            dec_end = dec_match.end()
+            # 提取装饰器的参数
+            params_str = dec_match.group(1).strip()
+
+            # 查找接下来的函数定义（跳过可能的空行）
+            after_decorator = content[dec_end:]
+            func_match = re.search(r'^(\s*)def\s+([^\s\(]+)', after_decorator, re.MULTILINE)
+
+            if not func_match:
+                continue
+
+            func_indent_len = len(func_match.group(1))
+            func_name = func_match.group(2)
+
+            # 3. 确定类名：查找装饰器前最近的、缩进小于函数缩进的类
+            class_name = ""
+            for cls_pos, cls_indent_len, cls_name in reversed(classes):
+                if cls_pos < dec_match.start() and func_indent_len > cls_indent_len:
+                    class_name = cls_name
+                    break
+
+            # 4. 处理参数，保持参数的格式
+            # 移除参数中的换行和多余空格，保持参数列表的格式
+            params = []
+            if params_str:
+                # 简单处理参数，保持引号内的内容不变
+                # 这里可以根据需要进行更复杂的参数解析
+                params = [p.strip() for p in params_str.split(',') if p.strip()]
+
+            # 构建参数部分的字符串
+            params_part = ""
+            if params:
+                params_part = ", " + ", ".join(params)
+
+            # 5. 记录删除位置和调用信息
+            deletions.append((dec_start, dec_end))
+            calls_to_add.append(f'_{caller_name}Login("{class_name}", "{func_name}"{params_part})')
+
+        # 6. 应用删除（倒序避免位置偏移）
+        if not deletions:
+            return content
+
+        result = content
+        for start, end in sorted(deletions, key=lambda x: x[0], reverse=True):
+            result = result[:start] + result[end:]
+
+        # 7. 在文末添加调用
+        if calls_to_add:
+            result = '\n'.join(calls_to_add) + '\n' + result
+
+        return result
+
     @staticmethod
     def process_mate_code(code):
         # 用于存储匹配到的信息
@@ -921,6 +999,8 @@ class Compiler(CompilerBase):
 
                     # 将PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "")插入到文件开头
                     content = self.auto_read(fpath)
+                    # 移除"""$..."""代码块
+                    content = re.sub(r'"""\$[\s\S]*?"""', '', content)
                     content = self.PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "") + content
                     # content = self.remove_long_docstring(content)  # 移除长注释 | remove long docstring
 
@@ -1077,10 +1157,13 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-        # ------------------------------------ 自定义:调用stage_recursive_replace ------------------------------------ #
+        # ------------------------------------ 自定义:调用stage_recursive_replace和stage_called_replace ------------------------------------ #
         for fpath in py_fpath:
             content = self.auto_read(fpath)
             content = self.stage_recursive_replace(content)  # 调用stage_recursive_replace
+            # 调用stage_called_replace处理四个装饰器
+            for caller in self.CALLED_FUNCTIONS:
+                content = self.stage_called_replace(caller, content)
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(content)
 
@@ -1217,12 +1300,22 @@ class Compiler(CompilerBase):
         :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
+        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"
-        total_js += f"const __AUTHOR__ = '{const.AUTHOR}';\nconst __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"
+        current_time = datetime.datetime.now()
+        timestamp_ms = int(current_time.timestamp() * 1000)
+        timestring = current_time.strftime("%Y-%m-%d %H:%M")
+
+        total_js = f"""const __VERSION__ = '{const.VERSION}';
+const __PYTHON_VERSION__ = '{python_version_info}';""" + self.TOTAL_INSERT_AT_HEAD + f"""
+export var LANGUAGE = '{config.language}';
+"""
+
+        total_js += f"export var TIMESTAMP = {timestamp_ms};\n"
+        total_js += f"export var TIMESTRING = '{timestring}';\n"
+        total_js += f"""const __AUTHOR__ = '{const.AUTHOR}';
+const __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)
@@ -1342,14 +1435,6 @@ class Compiler(CompilerBase):
         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
@@ -1365,6 +1450,14 @@ class Compiler(CompilerBase):
         with open(mjs_path, 'w', encoding='utf-8') as f:
             f.write(total_js)
 
+        # 复制.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))
+
         core.lprint(GREEN.format('[6/6]'), LOC_DONE, " ", LOC_EXPORTING_TOTAL_MAIN_JS_FINISH, sep="", head="\r", ln=config.language)
 
         if mjs_path != build_main_mjs:
@@ -1422,7 +1515,7 @@ if __name__ == '__main__':
     # compiler.compile()
     # compiler.clean()
     test = """
-    
+
 def patrolling(self, c: Creep):
     e = self.center.nearest(k.civilian.enemies, 5)
     if e:
@@ -1432,6 +1525,6 @@ def patrolling(self, c: Creep):
         ):
             case True: c.move(e, SWAMP_MOTION)
             case False: c.move(self.bpos, SWAMP_MOTION)
-    
+
     """
     print(f"res=\n{Compiler.convert_match_to_if(test)}")

{pyscreeps_arena-0.5.8.5 → pyscreeps_arena-0.5.9.0}/pyscreeps_arena/core/const.py

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