docs: 公式格式

* docs: Auto Generate Changelog of Release v5.26.0-beta.1

* docs: Refactor CHANGELOG to remove duplicates and update entries

Removed duplicate entries and updated various documentation items in the CHANGELOG.

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

.clang-format

@@ -1,5 +1,5 @@
 # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# for clang-format 17.0.1
+# for clang-format 20.0.0
 Language: Cpp
 BasedOnStyle: "WebKit"
 # AccessModifierOffset: 2
@@ -26,9 +26,9 @@ AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
+BreakAfterReturnType: Automatic
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
+BreakTemplateDeclarations: Yes
 # AttributeMacros:
 #   - __pragma
 #   - _Pragma
@@ -145,7 +145,7 @@ PointerAlignment: Left
 #  - constexpr
 #  - type
 ReferenceAlignment: Left
-ReflowComments: true
+ReflowComments: Always
 RemoveBracesLLVM: false
 RemoveParentheses: Leave
 RemoveSemicolon: false
@@ -188,3 +188,4 @@ TabWidth: 4
 UseTab: Never
 # VerilogBreakBetweenInstancePorts:
 # WhitespaceSensitiveMacros:
+RemoveEmptyLinesInUnwrappedLines: true

.devcontainer/Dockerfile

@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu
+
+USER vscode
+
+ENV CONDA_DIR=/home/vscode/miniconda
+ENV PATH="$CONDA_DIR/bin:$PATH"
+
+ARG PYTHON_VERSION=3.12
+ARG NODEJS_VERSION=24
+
+# Install Miniconda
+RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \
+    && bash ~/miniconda.sh -b -p $CONDA_DIR \
+    && rm ~/miniconda.sh \
+    && conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
+    && conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
+
+# Configure conda environment
+RUN eval "$(conda shell.bash hook)" \
+    && conda create -n maa python=$PYTHON_VERSION -y \
+    && conda activate maa \
+    && conda install -y conda-forge::nodejs=$NODEJS_VERSION \
+    && pip install pre-commit black \
+    && npm install -g pnpm
+
+# Finalize conda setup
+RUN conda init \
+    && conda config --set auto_activate false \
+    && echo "conda activate maa" >> ~/.bashrc

.devcontainer/devcontainer.json

@@ -1,13 +1,50 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
 {
-    "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04",
-    "features": {
-        "ghcr.io/devcontainers/features/python:1": {},
-        "ghcr.io/devcontainers/features/sshd:1": {}
+    "name": "MAA",
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    // "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "build": {
+        "dockerfile": "Dockerfile"
     },
-    "postCreateCommand": "sudo sh -ce 'apt update && apt install g++-12 -y && echo export CC=gcc-12 CXX=g++-12 >> /etc/profile.d/set-compiler.sh'",
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    // "features": {},
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    "forwardPorts": [3001],
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    "postCreateCommand": "bash .devcontainer/post-create.sh",
+
+    // Configure tool-specific properties.
     "customizations": {
         "vscode": {
-            "extensions": ["llvm-vs-code-extensions.vscode-clangd", "DavidAnson.vscode-markdownlint"]
+            "extensions": [
+                "mkxml.vscode-filesize",
+                "nekosu.maa-support",
+                "DavidAnson.vscode-markdownlint",
+                "esbenp.prettier-vscode",
+                "vue.volar",
+                "ms-python.python",
+                "ms-python.black-formatter"
+            ],
+            "settings": {
+                // format
+                "editor.formatOnSave": true,
+                "editor.defaultFormatter": "esbenp.prettier-vscode",
+                "[markdown]": {
+                    "editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
+                },
+                "[python]": {
+                    "editor.defaultFormatter": "ms-python.black-formatter"
+                },
+                // python
+                "python.terminal.launchArgs": ["-u"],
+                "python.defaultInterpreterPath": "/home/vscode/miniconda/envs/maa/bin/python",
+                "python.terminal.activateEnvironment": false
+            }
         }
     }
+    // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    // "remoteUser": "root"
 }

.devcontainer/post-create.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+WORKSPACE=$(pwd)
+
+# conda activate maa
+
+echo "===================="
+echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
+cd "$WORKSPACE"
+git config --global --add safe.directory "$WORKSPACE"
+git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
+
+echo "===================="
+cd "$WORKSPACE"
+echo "Installing dependencies for python..."
+# pip install -r tools/.../requirements.txt
+# pip install -r tools/.../requirements-dev.txt
+
+echo "===================="
+echo "Installing dependencies for nodejs..."
+cd "$WORKSPACE"/docs
+pnpm install --frozen-lockfile

.git-blame-ignore-revs

@@ -13,6 +13,7 @@
 290cc30f153a0206bd870a0a58cb6338aa16ea34
 db9afdc77e85d5fc462d923fca5318be021656cd
 a5daac889a55baf8895918d4964f20dad1938470
+9ed30c5658c88edf1ef839771a53c7d599183b8b
 
 # incorrect format of 3rdparty/resource/Arknights-Tile-Pos/levels.json
 65d654e54b9d04d1902c9ee9f9fb2679520adafd
@@ -42,6 +43,9 @@ bc3ad67a02cb3b8e154c06955cf17091c4265000
 # oxipng template optimization
 e3d63894b28b2ef5e2405e144a32a6981de5e1b2
 
+# refactor: divide tasks.json into multiple jsons
+dce6e317c8e56836662b64ac4b3d1a69b4ff4dd8
+
 # usage: add "[blame ignore]" to the commit message
 # This file is managed by an automated workflow
 # Do not add, remove or modify lines below this comment

.github/ISSUE_TEMPLATE/cn-bug-report.yaml

@@ -5,16 +5,18 @@ body:
   - type: checkboxes
     id: checks
     attributes:
-      label: 请确认自己完成了下列要求之后再进行勾选，若未完成但勾选将被直接关闭 Issue
+      label: 请确认自己完成了下列必选项之后再进行勾选，若未完成必选项或勾选了"我未仔细阅读"选项将视为自愿接受被直接关闭 Issue
       options:
         - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决
-          required: true
+          required: false
+        - label: 我未仔细阅读这些内容，只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues)，并相信这不会影响问题的处理
+          required: false
         - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
-          required: true
-        - label: 我使用的是当前更新版本的最新版，且已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) 和 [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容，并未提及该 Bug 已被修复的情况
-          required: true
-        - label: 我已检查了[常见问题](https://maa.plus/docs/zh-cn/manual/faq.html)、[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed)，确认我的问题未被提及
-          required: true
+          required: false
+        - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容并未提及该 Bug 已被修复的情况
+          required: false
+        - label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的问题未被提及
+          required: false
   - type: textarea
     id: describe
     attributes:
@@ -39,12 +41,11 @@ body:
     attributes:
       label: 日志和配置文件
       description: |
-        **请在关闭 MAA 后，上传以下 5 个文件：**
-          1. `debug` 文件夹中的 `asst.log` `gui.log` `asst.bak.log` 和 `gui.bak.log` 日志文件，并说明问题出现的大致时间点
-          2. `config` 文件夹中的 `gui.json` 配置文件
+        **请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮，点击并上传压缩包**
+
+        **请直接将完整的文件拖拽进来，而非自己裁切或复制的片段；若文件体积过大可压缩后再上传**
 
         如果你在使用 MacBook，请点击屏幕左上角的“文件”，点击“打开日志文件夹”
-        **请直接将完整的文件拖拽进来，而非自己裁切或复制的片段；若文件体积过大可压缩后再上传**
       placeholder: |
         请确认上传文件前已关闭 MAA
     validations:
@@ -55,7 +56,7 @@ body:
       label: 配置信息
       description: |
         请说明操作系统及版本、模拟器品牌、模拟器分辨率、DPI、帧率；
-        若正在使用 MuMu 12 或雷电 9，请说明截图增强是否开启；
+        若正在使用 MuMu 或雷电 9，请说明截图增强是否开启；
         最后请说明 GPU 加速推理是否开启，若开启请提供 GPU 型号。
     validations:
       required: true

.github/ISSUE_TEMPLATE/cn-feature-request.yaml

@@ -5,16 +5,18 @@ body:
   - type: checkboxes
     id: checks
     attributes:
-      label: 在提问之前...
+      label: 请确认自己完成了下列必选项之后再进行勾选，若未完成必选项或勾选了"我未仔细阅读"选项将视为自愿接受被直接关闭 Issue
       options:
-        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
-          required: true
         - label: 我基本确定这是一个新功能/建议，而不是遇到了 Bug（不确定的话请附上日志）
-          required: true
-        - label: 我使用的是当前更新版本的最新版，且已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) 和 [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容，确认我的建议未被提及
-          required: true
-        - label: 我已检查了 [公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed)，确认我的建议未被提及
-          required: true
+          required: false
+        - label: 我未仔细阅读这些内容，只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues)，并相信这不会影响问题的处理
+          required: false
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
+          required: false
+        - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容，确认我的建议未被提及
+          required: false
+        - label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的建议未被提及
+          required: false
   - type: textarea
     id: describe
     attributes:

.github/ISSUE_TEMPLATE/cn-ld-report.yaml

@@ -8,15 +8,17 @@ body:
       label: 在提问之前...
       options:
         - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决
-          required: true
+          required: false
         - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
-          required: true
-        - label: 我已检查了置顶议题（Pinned Issue），确认我的问题未被提及
-          required: true
+          required: false
+        - label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed)，确认我的问题未被提及
+          required: false
+        - label: 我未仔细阅读这些内容，只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues)，并相信这不会影响问题的处理
+          required: false
         - label: 我正在使用最新的 MAA 公测版本和最新的官版雷电 9 模拟器
-          required: true
+          required: false
         - label: 我已参考文档确定安装路径、实例编号填写正确，并确认在关闭截图增强模式后问题消失
-          required: true
+          required: false
         - label: 我未开启高帧率，且模拟器帧数设置为 60
           required: false
   - type: textarea
@@ -44,10 +46,8 @@ body:
     attributes:
       label: MAA 日志和配置文件
       description: |
-        **请在关闭 MAA 后，上传以下三个文件：**
-        1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件，并说明问题出现的大致时间点
-          若 asst.log 文件小于 10 KB，则需同时上传 asst.log.bak 文件
-        2. `config` 文件夹中的 `gui.json` 配置文件
+        **请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮，点击并上传压缩包**
+
         **请直接将完整的文件拖拽进来，而非自己裁切或复制的片段；若文件体积过大可压缩后再上传**
       placeholder: |
         请确认上传文件前已关闭 MAA

.github/ISSUE_TEMPLATE/cn-mumu-report.yaml

@@ -8,16 +8,18 @@ body:
       label: 在提问之前...
       options:
         - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决
-          required: true
+          required: false
         - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
-          required: true
-        - label: 我已检查了置顶议题（Pinned Issue），确认我的问题未被提及
-          required: true
+          required: false
+        - label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed)，确认我的问题未被提及
+          required: false
+        - label: 我未仔细阅读这些内容，只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues)，并相信这不会影响问题的处理
+          required: false
         - label: 我正在使用最新的 MAA 公测版本和最新的官版或方舟专版 MuMu 模拟器
-          required: true
+          required: false
         - label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确，并确认在关闭截图增强模式后问题消失
-          required: true
-        - label: 我未开启后台保活，模拟器帧数为 60，显存使用策略为“画面表现更好”
+          required: false
+        - label: 我未开启动态帧率及后台保活，模拟器帧数为 60，显存使用策略为“画面表现更好”
           required: false
   - type: textarea
     id: describe
@@ -44,10 +46,8 @@ body:
     attributes:
       label: MAA 日志和配置文件
       description: |
-        **请在关闭 MAA 后，上传以下三个文件：**
-        1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件，并说明问题出现的大致时间点
-          若 asst.log 文件小于 10 KB，则需同时上传 asst.log.bak 文件
-        2. `config` 文件夹中的 `gui.json` 配置文件
+        **请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮，点击并上传压缩包**
+
         **请直接将完整的文件拖拽进来，而非自己裁切或复制的片段；若文件体积过大可压缩后再上传**
       placeholder: |
         请确认上传文件前已关闭 MAA

.github/ISSUE_TEMPLATE/en-bug-report.yaml

@@ -1,24 +1,23 @@
 name: Bug Report (in English)
-description: >-
-  Recognition errors, operation abnormalities,
-  connection errors, etc.
+description: Recognition errors, operation abnormalities, connection errors, etc.
 labels: ["bug"]
 body:
   - type: checkboxes
     id: checks
     attributes:
-      label: Before raising the issue...
-      description: |
-        Please ensure that you have completed the requirements before checking the box.  
-        Issues with the checkbox checked but not completed will be directly closed.
+      label: |
+        Please ensure that you have completed the required items before checking the boxes.
+        Issues with incomplete required items or with the 'I did not read carefully' option checked will be considered voluntary acceptance of direct closure.
       options:
         - label: I understand that Issues are for feedback and problem solving, not trolling the comments section, and will provide as much information as possible to help solve the problem.
           required: true
         - label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
           required: true
-        - label: I am using the latest version of the current update version and have reviewed both the [Unreleased changes](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) and there is no mention of the bug being fixed.
+        - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of the bug being fixed.
           required: true
-        - label: I have reviewed the [FAQs](https://maa.plus/docs/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue/bug has not been mentioned.
+        - label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
+          required: false
+        - label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue has not been mentioned.
           required: true
   - type: textarea
     id: describe
@@ -43,14 +42,12 @@ body:
     id: logs
     attributes:
       label: Log and config files
-      description: >-
-        **After closing MAA, upload the following 5 files:**
-          1. The `asst.log` `gui.log` `asst.bak.log` and `gui.bak.log` log file in the `debug` folder, and indicate the approximate point in time when the problem occurred.
-          2. The `gui.json` config file in the `config` folder
+      description: |
+        **Please locate the Generate Support Payload button under MAA Settings -> Issue Report, click the button, and upload the generated zip file**
+
+        **Please drag and drop the full file in, not your own cuttings or copies; compress it before uploading if too large.**
 
         If you are using MacBook, please click the "File" option in the top-left corner of the screen, then click "Open Log Folder".
-        **Please drag and drop the full file in, not your own cuttings or copies;**
-        **compress it before uploading if too large.**
       placeholder: |
         Please confirm that MAA is not running before uploading files.
     validations:
@@ -61,7 +58,7 @@ body:
       label: Configuration information
       description: |
         Please specify the operating system and version, emulator brand, emulator resolution, DPI, and frame rate;
-        If you are using MuMu 12 or LDPlayer 9, please specify whether Screenshot Enhancement is enabled;
+        If you are using MuMu or LDPlayer 9, please specify whether Screenshot Enhancement is enabled;
         Finally, please specify whether GPU accelerated inference is enabled, and if so, provide the GPU model.
     validations:
       required: true
@@ -69,7 +66,7 @@ body:
     id: screenshots
     attributes:
       label: Screenshots or recordings
-      description: >-
+      description: |
         In the `debug` directory, within the functionally categorized folders, 
         there are some error images captured automatically.
         If related to this issue, please upload them together.
@@ -86,14 +83,13 @@ body:
         and their aspect ratio and resolution are inconsistent,
         which makes it harder for us to debug.
 
-        If the file siz is too large, you may compress it before uploading.
-
+        If the file size is too large, you may compress it before uploading.
     validations:
       required: false
   - type: textarea
     id: others
     attributes:
-      label: Anthing else?
+      label: Anything else?
       description: |
         Anything that will give us more insight into the problem you are having.
     validations:

.github/ISSUE_TEMPLATE/en-feature-request.yaml

@@ -5,21 +5,19 @@ body:
   - type: checkboxes
     id: checks
     attributes:
-      label: Before raising the issue...
+      label: |
+        Please ensure that you have completed the required items before checking the boxes.
+        Issues with incomplete required items or with the 'I did not read carefully' option checked will be considered voluntary acceptance of direct closure.
       options:
-        - label: |
-            I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list.  
-            Instead of "Some suggestions", "Stuck", etc.
+        - label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure).
           required: true
-        - label: |
-            I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure).
+        - label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
           required: true
-        - label: |
-            I am using the latest version of the current update version and have reviewed both the [Unreleased changes](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) and the [Pull requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls),  
-            but there is no mention of this feature/suggestion being added.
+        - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of this feature/suggestion being added.
           required: true
-        - label: |
-            I have reviewed the [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my feature/suggestion has not been mentioned.
+        - label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
+          required: false
+        - label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my feature/suggestion has not been mentioned.
           required: true
   - type: textarea
     id: describe

.github/dependabot.yaml

@@ -7,8 +7,8 @@ updates:
     commit-message:
       prefix: ci
     assignees:
-      - constrat
       - AnnAngela
+      - Constrat
     groups:
       github-actions:
         patterns:

.github/issue-checker.yml

@@ -522,7 +522,7 @@ labels:
   # `incomplete`
   - name: incomplete
     content: incomplete
-    regexes: '(?:\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\))'
+    regexes: '(?:\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\))|<!-- Uploading "(log|report)[^"]*\.zip"\.\.\. -->'
     mode: add
     skip-if:
       - skip all
@@ -532,7 +532,7 @@ labels:
       - remove incomplete
   - name: complete
     content:
-    regexes: '(?:\[asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)\]\([^\)]+\))'
+    regexes: '(?:\[asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)\]\([^\)]+\))|(log|report)[^.]*.zip'
   - name: remove incomplete
     content: incomplete
     mode: remove
@@ -547,12 +547,12 @@ labels:
 
 comments:
   - name: Log upload failed
-    regexes: '\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\)'
+    regexes: '\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\)|<!-- Uploading "log[^"]*\.zip"\.\.\. -->'
     content: "你的日志没有上传成功，请重新上传。\n\n\
       Your log did not upload successfully, please re-upload it."
     mode: add
   - name: Upload failed
-    regexes: "^[^`]*(`[^`]+`[^`]*)*\\[Uploading[^\\]]*…\\]\\(\\)"
+    regexes: "^[^`]*(`[^`]+`[^`]*)*(\\[Uploading[^\\]]*…\\]\\(\\)|<!-- Failed to upload|<!-- Uploading)"
     content: "你有一些文件没有上传成功，请重新上传。\n\n\
       You have some files that did not upload successfully, please re-upload them."
     mode: add

.github/stale_cache_cleanup.ps1

@@ -0,0 +1,75 @@
+$totalClearedSize = 0
+$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
+
+# List of keys to process
+$keyPatterns = @(
+    "Windows-x64-nuget",
+    "Windows-x64-maadeps",
+    "Windows-arm64-nuget",
+    "Windows-arm64-maadeps",
+    "macOS-x64-maadeps",
+    "macOS-arm64-maadeps",
+    "Linux-x64-maadeps",
+    "Linux-arm64-maadeps",
+    "Smoke-testing"
+)
+
+# Filter caches matching any of our key patterns
+$matchingCaches = $cacheList | Where-Object { 
+    $cache = $_
+    ($keyPatterns | Where-Object { $cache.key -like "*$_*" }).Count -gt 0 
+}
+
+# Get unique branch references from the matching caches
+$branches = $matchingCaches | Select-Object -Property ref -Unique | ForEach-Object { $_.ref }
+
+Write-Output "Found caches across $($branches.Count) branches"
+
+foreach ($branch in $branches) {
+    # Extract branch name from ref for display
+    $branchName = $branch -replace "refs/heads/", ""
+    if ($branch -match "refs/pull/(\d+)/merge") {
+        $branchName = "PR #$($matches[1])"
+    }
+    
+    Write-Output "Processing caches for branch: $branchName"
+    
+    # Filter for current branch caches
+    $branchCaches = $matchingCaches | Where-Object { $_.ref -eq $branch }
+    
+    foreach ($pattern in $keyPatterns) {
+        Write-Output "  Processing $branchName branch caches for pattern: $pattern"
+        
+        # Filter for caches matching the current key pattern within branch
+        $patternCaches = $branchCaches | Where-Object { $_.key -like "*$pattern*" }
+
+        if (-not $patternCaches) {
+            Write-Output "    No $branchName branch caches found for pattern: $pattern"
+            continue
+        }
+
+        # Sort by creation time (newest first)
+        $sortedCaches = $patternCaches | Sort-Object -Property createdAt -Descending
+
+        # Keep the first one (latest) and delete the rest
+        $latestCache = $sortedCaches[0]
+        Write-Output "    Keeping latest cache for $branchName/${pattern}: '$($latestCache.key)' (ID: $($latestCache.id))"
+
+        # Delete all except the latest one
+        for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
+            $cache = $sortedCaches[$i]
+            $cacheId = $cache.id
+            $cacheKey = $cache.key
+
+            Write-Output "    Deleting cache for $branchName/${pattern}: '$cacheKey' (ID: $cacheId)"
+            gh cache delete $cacheId
+            
+            $totalClearedSize += $cache.sizeInBytes
+        }
+    }
+    
+    Write-Output ""
+}
+
+$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
+Write-Output "Total cleared size: $formattedSize MB"

.github/stale_cache_dev.ps1

@@ -0,0 +1,59 @@
+$totalClearedSize = 0
+$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
+
+# Filter for dev branch caches only
+$devCaches = $cacheList | Where-Object { $_.ref -eq "refs/heads/dev" }
+
+if (-not $devCaches) {
+    Write-Output "No caches found for dev branch."
+    exit
+}
+
+# List of keys to process
+$keyPatterns = @(
+    "Windows-x64-nuget",
+    "Windows-x64-maadeps",
+    "Windows-arm64-nuget",
+    "Windows-arm64-maadeps",
+    "macOS-x64-maadeps",
+    "macOS-arm64-maadeps",
+    "Linux-x64-maadeps",
+    "Linux-arm64-maadeps",
+    "Smoke-testing"
+)
+
+foreach ($pattern in $keyPatterns) {
+    Write-Output "Processing dev branch caches for pattern: $pattern"
+    
+    # Filter for caches matching the current key pattern within dev branch
+    $matchingCaches = $devCaches | Where-Object { $_.key -like "*$pattern*" }
+
+    if (-not $matchingCaches) {
+        Write-Output "  No dev branch caches found for pattern: $pattern"
+        continue
+    }
+
+    # Sort by creation time (newest first)
+    $sortedCaches = $matchingCaches | Sort-Object -Property createdAt -Descending
+
+    # Keep the first one (latest) and delete the rest
+    $latestCache = $sortedCaches[0]
+    Write-Output "  Keeping latest dev branch cache: '$($latestCache.key)' (ID: $($latestCache.id))"
+
+    # Delete all except the latest one
+    for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
+        $cache = $sortedCaches[$i]
+        $cacheId = $cache.id
+        $cacheKey = $cache.key
+
+        Write-Output "  Deleting dev branch cache: '$cacheKey' (ID: $cacheId)"
+        gh cache delete $cacheId
+        
+        $totalClearedSize += $cache.sizeInBytes
+    }
+    
+    Write-Output ""
+}
+
+$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
+Write-Output "Total cleared size: $formattedSize MB"

.github/workflows/blame-ignore.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           persist-credentials: false # Needed to bypass protection rules in Push changes

.github/workflows/ci.yml

@@ -12,9 +12,9 @@ on:
       - "src/**"
       - "cmake/**"
       - "CMakeLists.txt"
-      - "MAA.sln"
       - ".github/workflows/ci.yml"
       - "!**/*.md"
+      - "tools/maadeps-download.py"
   pull_request:
     branches:
       - "dev"
@@ -24,8 +24,8 @@ on:
       - "src/**"
       - "cmake/**"
       - "CMakeLists.txt"
-      - "MAA.sln"
       - "!**/*.md"
+      - "tools/maadeps-download.py"
   workflow_dispatch:
 
 concurrency:
@@ -45,7 +45,7 @@ jobs:
       prerelease: ${{ steps.set_pre.outputs.prerelease }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: temp
           show-progress: false
@@ -89,6 +89,8 @@ jobs:
           fi
           echo >> CHANGELOG.md
           echo "**Full Changelog**: [$last_tag -> $this_tag](https://github.com/MaaAssistantArknights/MaaAssistantArknights/compare/${last_tag}...${this_tag})" >> CHANGELOG.md
+          echo >> CHANGELOG.md
+          echo "[已有 Mirror酱 CDK？前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=MAA&source=maagh-release)" >> CHANGELOG.md
 
       - name: Upload changelog to Github
         uses: actions/upload-artifact@v4
@@ -106,18 +108,13 @@ jobs:
     needs: meta
     strategy:
       matrix:
-        include:
-          - msbuild_target: x64
-            lowercase_target: x64
-          - msbuild_target: ARM64
-            lowercase_target: arm64
-    env:
-      MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
+        arch: [arm64, x64]
+      fail-fast: false
     runs-on: windows-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
@@ -125,6 +122,35 @@ jobs:
         run: |
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
 
+      - name: Cache MaaDeps
+        id: cache-maadeps
+        uses: actions/cache@v4
+        with:
+          path: |
+            ./MaaDeps
+          key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
+
+      - name: Bootstrap MaaDeps
+        if: steps.cache-maadeps.outputs.cache-hit != 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
+
+      - name: Config cmake
+        run: |
+          mkdir -p build
+          cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=Release -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' -DBUILD_WPF_GUI=OFF
+
+      - name: Build
+        run: |
+          cmake --build build --config Release --parallel $env:NUMBER_OF_PROCESSORS
+
+      - name: Install
+        run: |
+          mkdir -p install
+          cmake --install build --prefix install --config Release
+
       - name: Cache .nuke/temp, ~/.nuget/packages
         id: cache-nuget
         uses: actions/cache@v4
@@ -132,38 +158,13 @@ jobs:
           path: |
             .nuke/temp
             ~/.nuget/packages
-          key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
 
       - name: Restore dependencies
         if: steps.cache-nuget.outputs.cache-hit != 'true'
-        run: dotnet restore
+        run: dotnet restore src/MaaWpfGui/MaaWpfGui.csproj
 
-      - name: Cache MaaDeps
-        id: cache-maadeps
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./MaaDeps
-          key: ${{ runner.os }}-${{ matrix.lowercase_target }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
-
-      - name: Bootstrap MaaDeps
-        if: steps.cache-maadeps.outputs.cache-hit != 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python3 maadeps-download.py ${{ matrix.lowercase_target }}-windows
-
-      - name: Create fake event file
-        shell: bash
-        run: cp -v "$GITHUB_EVENT_PATH" ./event.json
-
-      - name: Merge Event Data with Inputs
-        if: startsWith(github.ref, 'refs/tags/v')
-        shell: bash
-        run: |
-          cat "$GITHUB_EVENT_PATH" | jq '. + { "inputs": {"ReleaseSimulation": "${{ needs.meta.outputs.tag }}"} }' | tee ./event.json
-
-      - name: Taggify Version
+      - name: Taggify Version for csproj
         run: |
           $csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
           $csprojPath = Resolve-Path -Path $csprojPath
@@ -180,29 +181,31 @@ jobs:
           $node.FileVersion = $match
           $node.AssemblyVersion = $match
           $csproj.Save($csprojPath)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build
+      - name: Publish WPF GUI
+        continue-on-error: true
         run: |
-          $env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
-          $env:GITHUB_EVENT_PATH = "$pwd\\event.json"
-          $env:GITHUB_REF = "refs/heads/not_master"
-          $env:MAA_BUILDER_MAA_VERSION = '${{ needs.meta.outputs.tag }}'
-          ./build.cmd DevBuild
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -o install
 
-      - name: Cleanup checksum file
-        run: |
-          rm -vf ./artifacts/checksum.json
+      - name: Organize Install Files
         shell: bash
+        run: |
+          rm -rf install/*.pdb
+          rm -rf install/msvc-debug
+          rm -rf install/*.h
+
+          cp tools/DependencySetup_依赖库安装.bat install
+
+      - name: Zip files
+        run: |
+          cd install
+          Compress-Archive -Destination MAA-${{ needs.meta.outputs.tag }}-win-${{ matrix.arch }}.zip -Path ./*
 
       - name: Upload MAA to Github
         uses: actions/upload-artifact@v4
         with:
-          name: MAA-win-${{ matrix.lowercase_target }}
-          path: artifacts
+          name: MAA-win-${{ matrix.arch }}
+          path: install/*.zip
 
   ubuntu:
     # Prevent duplicate runs on organization branches with PRs
@@ -211,15 +214,14 @@ jobs:
       github.event.pull_request.base.repo.full_name
 
     needs: meta
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         arch: [aarch64, x86_64]
-    permissions:
-      actions: write
+      fail-fast: false
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
@@ -228,40 +230,41 @@ jobs:
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
           git submodule update --init --depth 1 src/maa-cli
 
-      - name: Install cross compile toolchains
-        if: ${{ matrix.arch != 'x86_64' }}
-        run: |
-          sudo apt-get update
-          sudo apt-get install g++-12-aarch64-linux-gnu g++-12-aarch64-linux-gnu
+      - name: Cache MaaDeps
+        id: cache-maadeps
+        uses: actions/cache@v4
+        with:
+          path: ./MaaDeps
+          key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
-      # Caching not necessary on ubuntu runner
       - name: Bootstrap MaaDeps
+        if: steps.cache-maadeps.outputs.cache-hit != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          python3 maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
+          python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
 
-      - name: Build MAA
+      - name: Config cmake
         run: |
           mkdir -p build
           cmake -B build \
-            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
+            -DCMAKE_BUILD_TYPE=Release \
             -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
-            -DINSTALL_THIRD_LIBS=ON \
             -DINSTALL_RESOURCE=ON \
             -DINSTALL_PYTHON=ON \
-            -DMAA_VERSION='${{ needs.meta.outputs.tag }}'
-          cmake --build build --parallel $(nproc --all)
+            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
+            -DCMAKE_TOOLCHAIN_FILE=MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
 
-          mkdir -p install
-          cmake --install build --prefix install
+      - name: Build
+        run: |
+          cmake --build build --config Release --parallel $(nproc)
         env:
-          CC: ${{ matrix.arch == 'x86_64' && 'gcc-12' || 'aarch64-linux-gnu-gcc-12' }}
-          CXX: ${{ matrix.arch == 'x86_64' && 'g++-12' || 'aarch64-linux-gnu-g++-12' }}
-          CMAKE_COLOR_DIAGNOSTICS: ON
           CLICOLOR_FORCE: 1
-          CXXFLAGS: | # workaround for gcc bugs
-            -Wno-error=restrict -Wno-error=array-bounds -Wno-error=stringop-overread -Wno-error=missing-field-initializers
+
+      - name: Install
+        run: |
+          mkdir -p install
+          cmake --install build --prefix install --config Release
 
       - name: Setup Cross Compile Toolchains for CLI
         uses: ./src/maa-cli/.github/actions/setup
@@ -306,7 +309,7 @@ jobs:
           ln -sv usr/share/maa/maa Maa.AppDir/AppRun
           mkdir -pv Maa.AppDir/usr/share/metainfo/
           cp -v tools/AppImage/io.github.maaassistantarknights.maaassistantarknights.metainfo.xml Maa.AppDir/usr/share/metainfo/
-          wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+          wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           # appimagetool with embedded runtime does not support cross build, till AppImage/appimagetool 7a10b8
           wget "https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-${{ matrix.arch }}"
           chmod a+x appimagetool-x86_64.AppImage
@@ -335,36 +338,50 @@ jobs:
       github.event.pull_request.base.repo.full_name
 
     needs: meta
-    runs-on: macos-14
+    runs-on: macos-latest
     strategy:
       matrix:
         arch: [arm64, x86_64]
+      fail-fast: false
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
-      - name: Install Dependencies
-        run: |
-          brew install ninja
+      # ninja 1.13.1 is already installed and up-to-date.
+      # - name: Install Dependencies
+      #   run: |
+      #     brew install ninja
+
+      - name: Cache MaaDeps
+        id: cache-maadeps
+        uses: actions/cache@v4
+        with:
+          path: ./MaaDeps
+          key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
-      # Caching not necessary on macOS runner
       - name: Bootstrap MaaDeps
         run: |
           [[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
-          python3 maadeps-download.py ${triplet}
+          python3 tools/maadeps-download.py ${triplet}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Configure MaaCore
+      - name: Config cmake
         run: |
-          cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' -DMAA_VERSION='${{ needs.meta.outputs.tag }}'
+          cmake -B build -GNinja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' \
+            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
 
-      - name: Build MaaCore
+      - name: Build
         run: |
-          cmake --build build
-          cmake --install build --prefix install
+          cmake --build build --config Release --parallel $(sysctl -n hw.logicalcpu)
+
+      - name: Install
+        run: |
+          cmake --install build --prefix install --config Release
 
       - name: Upload MAA to Github
         uses: actions/upload-artifact@v4
@@ -379,10 +396,10 @@ jobs:
       github.event.pull_request.base.repo.full_name
 
     needs: [meta, macOS-Core]
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
@@ -397,13 +414,13 @@ jobs:
           git submodule update --init --depth 1 src/MaaMacGui
 
       - name: Download Arm64 MAA from Github
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: MAACore-macos-arm64
           path: install-arm64
 
       - name: Download x64 MAA from Github
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: MAACore-macos-x86_64
           path: install-x86_64
@@ -417,7 +434,7 @@ jobs:
 
       - name: Download Provisioning Profiles
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: apple-actions/download-provisioning-profiles@v3
+        uses: apple-actions/download-provisioning-profiles@v4
         with:
           bundle-id: "com.hguandl.MeoAsstMac"
           issuer-id: ${{ secrets.HGUANDL_APPSTORE_ISSUER }}
@@ -545,7 +562,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download MAA from Github
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           path: assets
 
@@ -558,7 +575,7 @@ jobs:
           find . -type f | while read f; do mv -fvt . $f; done
 
       - name: Release to Github
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.3
         with:
           body_path: CHANGELOG.md
           files: |
@@ -577,3 +594,12 @@ jobs:
           gh workflow run --repo $GITHUB_REPOSITORY release-ota
         env:
           GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
+
+      - name: Create issue if failed
+        if: failure()
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-issue"
+          title: "Failed Release"
+          body: |
+            ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/codeql-core.yml

@@ -0,0 +1,57 @@
+name: "CodeQL MaaCore and MaaWpfGui Analysis"
+
+on:
+  pull_request:
+    branches: ["dev"]
+    paths:
+      - "3rdparty/include/**"
+      - "include/**"
+      - "src/**"
+      - "cmake/**"
+      - "CMakeLists.txt"
+      - ".github/workflows/codeql-core.yml"
+      - "!**/*.md"
+      - "!**/*.xaml"
+  schedule:
+    - cron: "45 11 * * *" # Runs daily at 11:45 UTC
+  workflow_dispatch:
+
+permissions:
+  actions: write
+  contents: read
+  packages: read
+  security-events: write
+
+jobs:
+  analyze-manual:
+    name: Analyze MaaCore and MaaWpfGui
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          show-progress: false
+
+      - name: Setup CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: c-cpp,csharp
+          build-mode: manual
+
+      - name: Run CodeQL
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:multi-manual"
+
+      - name: Delete old caches
+        shell: pwsh
+        run: |
+          $oldCaches = gh cache list --key codeql --order asc --json key | ConvertFrom-Json | Select-Object -SkipLast 1
+            foreach ($cache in $oldCaches) {
+              if ($cache.key) {
+                Write-Host "Deleting cache: $($cache.key)"
+                gh cache delete $cache.key
+              }
+            }
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-wf.yml

@@ -0,0 +1,36 @@
+name: "CodeQL Workflows Analysis"
+
+on:
+  pull_request:
+    branches: ["dev"]
+    paths:
+      - ".github/**/*.yml"
+  schedule:
+    - cron: "00 12 * * *" # Runs daily at 12:00 UTC
+  workflow_dispatch:
+
+permissions:
+  actions: write
+  contents: read
+  security-events: write
+
+jobs:
+  analyze-workflows:
+    name: Analyze GitHub Workflows
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          show-progress: false
+
+      - name: Setup CodeQL for GitHub Actions
+        uses: github/codeql-action/init@v3
+        with:
+          languages: actions
+          build-mode: none
+
+      - name: Run CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:multi-none"

.github/workflows/gen-changelog.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           show-progress: false
@@ -48,7 +48,7 @@ jobs:
 
           echo '======='
 
-          echo 'Target RP: ${{ github.event.pull_request.html_url }}' >> $PR_BODY
+          echo 'Target PR: ${{ github.event.pull_request.html_url }}' >> $PR_BODY
           echo '' >> $PR_BODY
           echo '<details><summary>Debug info</summary>' >> $PR_BODY
           echo '' >> $PR_BODY

.github/workflows/issue-checkbox-checker.yml

@@ -0,0 +1,152 @@
+name: Auto Close not reading issues or Fold checkboxes
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  check-then-close-or-fold:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Check for duplicate issues in last hour
+        id: duplicate-check
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const oneHourAgo = new Date(Date.now() - 60 * 60 * 1000);
+            const currentIssueCreatedAt = new Date(context.payload.issue.created_at);
+            const issueAuthor = context.payload.issue.user.login;
+
+            // 重新获取该用户最近的 issues
+            const { data: userIssues } = await github.rest.issues.listForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              creator: issueAuthor,
+              state: 'all',
+              since: oneHourAgo.toISOString(),
+              per_page: 30
+            });
+
+            // 过滤出1小时内创建的其他 issues（排除当前 issue）
+            const recentIssues = userIssues.filter(issue => {
+              const issueCreatedAt = new Date(issue.created_at);
+              return issue.number !== context.issue.number && 
+                     issueCreatedAt >= oneHourAgo &&
+                     issueCreatedAt < currentIssueCreatedAt;
+            });
+
+            if (recentIssues.length > 0) {
+              // 给当前 issue 添加标签
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                labels: ['rapid-submission']
+              });
+              
+              // 给1小时内的其他 issues 也添加标签
+              for (const issue of recentIssues) {
+                try {
+                  await github.rest.issues.addLabels({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: issue.number,
+                    labels: ['rapid-submission']
+                  });
+                  console.log(`Added rapid-submission label to issue #${issue.number}`);
+                } catch (error) {
+                  console.log(`Failed to add label to issue #${issue.number}: ${error.message}`);
+                }
+              }
+            }
+
+      - name: Check checkbox status
+        id: unread-checkbox-check
+        uses: actions/github-script@v8
+        with:
+          script: |
+            // 找不到###就算了
+            if (!/###([^#]+)###/.test(context.payload.issue.body)) {
+              return false;
+            }
+            var checkList = /###([^#]+)###/.exec(context.payload.issue.body)[1];
+            const UnreadRegexCn = /- \[x\]\s*.*?我.*未仔细阅读/i;
+            const UnreadRegexCn_ = /- \[ \]\s*.*?我.*未仔细阅读/i;
+            if (/- \[(x| )\]\s*.*?[\u4e00-\u9fa5]+/i.test(checkList)) { // 中英区分
+              if (UnreadRegexCn.test(checkList)) {
+                return true;
+              }
+              checkList = checkList.replace(UnreadRegexCn_, "");
+              return /- \[ \]\s*.*?[\u4e00-\u9fa5]+/i.test(checkList);
+            }
+            const texts = [
+            'I have checked all the options without carefully reading the content and believe this will not affect issue resolution.'];
+            return texts.some(text => new RegExp(`- \\[x\\]\\s*${text}`).test(context.payload.issue.body));
+
+      - name: Close and lock issue
+        if: steps.unread-checkbox-check.outputs.result == 'true'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              state: 'closed',
+              state_reason: 'not_planned'
+            });
+
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: ['low-quality-report']
+            });
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: '因为未阅读模板提示并正确提交，触发了自动关闭规则\n\nBecause the template prompt was not read and submitted correctly, the automatic closing rule was triggered'
+            });
+
+      - name: Fold checkboxes
+        if: steps.unread-checkbox-check.outputs.result == 'false'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const originalBody = context.payload.issue.body;
+            if (originalBody.includes('<details><summary>Checkboxes</summary>\n\n')) {
+              return;
+            }
+            const checkboxSectionRegex_cn_bug = /([\s\S]*?)(### 问题描述\n\n)/;
+            const checkboxSectionRegex_cn_feat = /([\s\S]*?)(### 说说你遇到的问题？\n\n)/;
+            const checkboxSectionRegex_en_bug = /([\s\S]*?)(### Description\n\n)/;
+            const checkboxSectionRegex_en_feat = /([\s\S]*?)(### The problems you have encountered?\n\n)/;
+
+            const foldedBody_cn_bug = originalBody.replace(
+              checkboxSectionRegex_cn_bug,
+              `<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
+            );
+            const foldedBody_cn_feat = foldedBody_cn_bug.replace(
+              checkboxSectionRegex_cn_feat,
+              `<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
+            );
+            const foldedBody_en_bug = foldedBody_cn_feat.replace(
+              checkboxSectionRegex_en_bug,
+              `<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
+            );
+            const foldedBody = foldedBody_en_bug.replace(
+              checkboxSectionRegex_en_feat,
+              `<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
+            );
+
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: foldedBody
+            });

.github/workflows/markdown-checker.yml

@@ -26,25 +26,32 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
+      - name: Cache Primes
+        id: cache-primes
+        uses: actions/cache@v4
+        with:
+          path: .lycheecache
+          key: lychee-cache
+
       - name: Check dead links
         uses: lycheeverse/lychee-action@v2
         with:
-          # 仅检查内部链接和 Github 相关链接
+          # 仅检查内部链接，排除所有外部链接
           args: >
-            --verbose --no-progress --cache --max-cache-age 1d
+            --verbose --no-progress
+            --cache --max-cache-age 1d --cache-exclude-status '429, 500..599'
             --exclude 'https?://.*'
-            --include 'https?://github\.com/.*'
-            --include 'https?://raw\.githubusercontent\.com/.*'
-            --include 'https?://user-images\.githubusercontent\.com/.*'
             --exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
             --exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
-            --exclude 'files/MAA_Runtime_Fix_Pwsh.ps1$'
             -- './docs/**/*.md' './README.md'
 
       - name: Comment (only for PR)

.github/workflows/mirrorchyan.yml

@@ -8,7 +8,8 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: MirrorChyan/uploading-action@v1
+      - name: Upload MAA win x64
+        uses: MirrorChyan/uploading-action@v1
         if: always()
         with:
           filetype: latest-release
@@ -22,7 +23,8 @@ jobs:
           os: win
           arch: x64
 
-      - uses: MirrorChyan/uploading-action@v1
+      - name: Upload MAA win arm64
+        uses: MirrorChyan/uploading-action@v1
         if: always()
         with:
           filetype: latest-release
@@ -35,3 +37,35 @@ jobs:
           upload_token: ${{ secrets.MirrorChyanUploadToken }}
           os: win
           arch: arm64
+
+      - name: Upload MAA macos arm64
+        uses: MirrorChyan/uploading-action@v1
+        if: always()
+        with:
+          filetype: latest-release
+          filename: "MAA-*-macos-universal.dmg"
+          extra_zip: true
+          mirrorchyan_rid: MAA
+
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          owner: ${{ github.repository_owner }}
+          repo: ${{ github.event.repository.name }}
+          upload_token: ${{ secrets.MirrorChyanUploadToken }}
+          os: macos
+          arch: arm64
+
+      - name: Upload MAA macos x64
+        uses: MirrorChyan/uploading-action@v1
+        if: always()
+        with:
+          filetype: latest-release
+          filename: "MAA-*-macos-universal.dmg"
+          extra_zip: true
+          mirrorchyan_rid: MAA
+
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          owner: ${{ github.repository_owner }}
+          repo: ${{ github.event.repository.name }}
+          upload_token: ${{ secrets.MirrorChyanUploadToken }}
+          os: macos
+          arch: x64

.github/workflows/mirrorchyan_release_note.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - id: uploading
+      - name: Release Note for MAA
         uses: MirrorChyan/release-note-action@v1
         with:
           mirrorchyan_rid: MAA

.github/workflows/optimize-templates.yml

@@ -44,27 +44,28 @@ jobs:
 
       - name: Checkout repository
         if: steps.check_push.outputs.is_pr != 'True'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           persist-credentials: false
 
       - name: Setup python
         if: steps.check_push.outputs.is_pr != 'True'
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
-      - name: Cache Python packages
-        id: cache_python
-        if: steps.check_push.outputs.is_pr != 'True' && always()
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
-          key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
+      # - name: Cache Python packages
+      #   id: cache_python
+      #   if: steps.check_push.outputs.is_pr != 'True' && always()
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
+      #     key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
 
       - name: Install dependencies
-        if: steps.check_push.outputs.is_pr != 'True' && steps.cache_python.outputs.cache-hit != 'true'
+        # if: steps.check_push.outputs.is_pr != 'True' && steps.cache_python.outputs.cache-hit != 'true'
+        if: steps.check_push.outputs.is_pr != 'True'
         run: |
           pip install -r tools/OptimizeTemplates/requirements.txt
 
@@ -101,7 +102,7 @@ jobs:
           fi
 
       - name: Push changes
-        if: steps.check_push.outputs.is_pr != 'True' && steps.commit_changes.outputs.have_commits == 'True'
+        if: steps.check_push.outputs.is_pr != 'True' && steps.commit_changes.outputs.have_commits == 'True' && github.repository_owner == 'MaaAssistantArknights'
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.MAA_RESOURCE_SYNC }}

.github/workflows/pr-auto-tag.yml

@@ -9,6 +9,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
+        description: "Name of the tag to create for the release"
         type: string
         required: true
 
@@ -19,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           token: ${{ secrets.MAARELEASE_RELEASE }}

.github/workflows/pr-checker.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cleanup Previous Comment
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: comments } = await github.rest.issues.listComments({
@@ -28,7 +28,7 @@ jobs:
               });
             }
       - name: Check Commits
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: commits } = await github.rest.pulls.listCommits({

.github/workflows/release-nightly-ota.yml

@@ -16,12 +16,12 @@ on:
       limit_maa:
         description: "Number of releases to fetch from MaaAssistantArknights"
         required: true
-        default: "10"
+        default: 10
         type: number
-      limit_mr:
+      limit_maarelease:
         description: "Number of releases to fetch from MaaRelease"
         required: true
-        default: "10"
+        default: 10
         type: number
 
 jobs:
@@ -30,17 +30,15 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        msbuild_target: [x64]
+        arch: [x64]
       fail-fast: false
-    env:
-      MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
     outputs:
       tag: ${{ steps.set_tag.outputs.tag }}
       pre_version: ${{ steps.set_tag.outputs.pre_version }}
       main_tag_name: ${{ steps.push_main_tag.outputs.main_tag_name }}
       changelog: ${{ steps.read_changelog.outputs.content }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           # repository: 'MaaAssistantArknights/MaaAssistantArknights'
           #ref: ${{ inputs.ref }}
@@ -168,6 +166,35 @@ jobs:
         with:
           path: ./changelog_notag.md
 
+      - name: Cache MaaDeps
+        id: cache-maadeps
+        uses: actions/cache@v4
+        with:
+          path: |
+            ./MaaDeps
+          key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
+
+      - name: Bootstrap MaaDeps
+        if: steps.cache-maadeps.outputs.cache-hit != 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
+
+      - name: Config cmake
+        run: |
+          mkdir -p build
+          cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=Release -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ steps.set_tag.outputs.tag }}' -DBUILD_WPF_GUI=OFF
+
+      - name: Build
+        run: |
+          cmake --build build --config Release --parallel $env:NUMBER_OF_PROCESSORS
+
+      - name: Install
+        run: |
+          mkdir -p install
+          cmake --install build --prefix install --config Release
+
       - name: Cache .nuke/temp, ~/.nuget/packages
         id: cache-nuget
         uses: actions/cache@v4
@@ -175,28 +202,13 @@ jobs:
           path: |
             .nuke/temp
             ~/.nuget/packages
-          key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
 
       - name: Restore dependencies
         if: steps.cache-nuget.outputs.cache-hit != 'true'
-        run: dotnet restore
+        run: dotnet restore src/MaaWpfGui/MaaWpfGui.csproj
 
-      - name: Cache MaaDeps
-        id: cache-maadeps
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./MaaDeps
-          key: ${{ runner.os }}-${{ matrix.msbuild_target }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
-
-      - name: Bootstrap MaaDeps
-        if: steps.cache-maadeps.outputs.cache-hit != 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python3 maadeps-download.py ${{ matrix.msbuild_target }}-windows
-
-      - name: Taggify Version
+      - name: Taggify Version for csproj
         run: |
           $csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
           $csprojPath = Resolve-Path -Path $csprojPath
@@ -206,8 +218,6 @@ jobs:
           } else {
               $match = "0.0.1"
           }
-          echo "Tag value: $tag"
-          echo "Version value: $match"
           [xml]$csproj = Get-Content -Path $csprojPath
           $node = $csproj.Project.PropertyGroup | where {$_.ApplicationVersion -ne $null}
           $node.InformationalVersion = $tag
@@ -215,25 +225,25 @@ jobs:
           $node.FileVersion = $match
           $node.AssemblyVersion = $match
           $csproj.Save($csprojPath)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Run './build.cmd DevBuild'
+      - name: Publish WPF GUI
         run: |
-          $env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
-          $env:MAA_BUILDER_MAA_VERSION = "${{ steps.set_tag.outputs.tag }}"
-          echo "tag: " $env:MAA_BUILDER_MAA_VERSION
+          dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -o install
 
-          ./build.cmd DevBuild
-        env:
-          Reason: "Build nightly version"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Organize Install Files
+        shell: bash
+        run: |
+          rm -rf install/*.pdb
+          rm -rf install/msvc-debug
+          rm -rf install/*.h
+
+          cp tools/DependencySetup_依赖库安装.bat install
 
       - name: Upload MAA to Github
         uses: actions/upload-artifact@v4
         with:
-          name: MAA-win-${{ matrix.msbuild_target }}
-          path: artifacts
+          name: MAA-win-${{ matrix.arch }}
+          path: install
 
       - name: Push tag to main repo
         id: push_main_tag
@@ -252,7 +262,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch MaaRelease
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
           fetch-depth: 0
@@ -282,14 +292,14 @@ jobs:
           echo ${{ needs.build-win-nightly.outputs.tag }}
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: MaaAssistantArknights
           token: ${{ secrets.MAARELEASE_RELEASE }}
           show-progress: false
 
       - name: Download MAA from Github
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: MAA-win-${{ matrix.target }}
           path: ${{ format('{0}/{1}', 'build-ota', needs.build-win-nightly.outputs.tag) }}
@@ -303,12 +313,12 @@ jobs:
           limit_maa=${limit_maa%.*}
           echo "Parsed limit_maa: $limit_maa"
 
-          limit_mr=${{ inputs.limit_mr || 10 }}
-          limit_mr=${limit_mr%.*}
-          echo "Parsed limit_mr: $limit_mr"
+          limit_maarelease=${{ inputs.limit_maarelease || 10 }}
+          limit_maarelease=${limit_maarelease%.*}
+          echo "Parsed limit_maarelease: $limit_maarelease"
 
           gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
-          gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_mr | tee ./release_mr.txt
+          gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_maarelease | tee ./release_mr.txt
           echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
 
           cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
@@ -328,8 +338,7 @@ jobs:
           cd build-ota
 
           pushd ${{ needs.build-win-nightly.outputs.tag }}
-          zip -d *.zip '*.lib' '*.pdb' '*.exp' '*.config' '*.xml'
-          mv *.zip MAA-${{ env.release_tag }}-win-${{ matrix.target }}.zip
+          zip -r MAA-${{ env.release_tag }}-win-${{ matrix.target }}.zip ./*
           popd
 
           $GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ./config ${{ matrix.target }} "${{ github.repository_owner }}/MaaRelease"

.github/workflows/release-ota.yml

@@ -9,12 +9,12 @@ on:
       limit:
         description: Number of releases to fetch from MaaAssistantArknights, 2 at least
         required: false
-        default: "31"
+        default: 31
         type: number
       limit_2:
         description: Number of releases to fetch from MaaRelease
         required: false
-        default: "30"
+        default: 30
         type: number
 
 env:
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch MaaRelease
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
@@ -94,10 +94,13 @@ jobs:
           - x64
     steps:
       - name: Download release config
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
+        with:
+          name: MaaReleaseConfig
+          path: ./MaaReleaseConfig
 
       - name: Fetch MaaRelease
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
@@ -106,7 +109,7 @@ jobs:
           token: ${{ secrets.MAARELEASE_RELEASE }}
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           path: MaaAssistantArknights
@@ -134,6 +137,15 @@ jobs:
           prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
           overwrite: true
 
+      - name: Create issue if failed
+        if: failure()
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-issue"
+          title: "Failed make release OTA for Windows"
+          body: |
+            ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
   make-ota-mac:
     needs: create-tag
     runs-on: macos-14
@@ -177,6 +189,15 @@ jobs:
           prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
           overwrite: true
 
+      - name: Create issue if failed
+        if: failure()
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-issue"
+          title: "Failed make release OTA for macos"
+          body: |
+            ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            
   release:
     needs:
       - make-ota

.github/workflows/res-update-game.yml

@@ -1,4 +1,4 @@
-name: res-update-game
+name: Resource Updater
 
 on:
   schedule:
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone ArknightsGameResource for Official
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           repository: yuanyan3060/ArknightsGameResource
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone ArknightsGameResource_Yostar for Overseas
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           repository: ArknightsAssets/ArknightsGamedata
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone arknights-toolbox-update for Taiwan
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
           repository: arkntools/arknights-toolbox-update
@@ -124,52 +124,15 @@ jobs:
           path: ./excel
           compression-level: 0
 
-  original-json:
-    if: github.repository_owner == 'MaaAssistantArknights'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Initializization
-        run: |
-          urls=(
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/.prettierrc|.prettierrc"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/tools/TaskSorter/TaskSorter.py|TaskSorter.py"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/resource/tasks.json|tasks.json"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/resource/global/txwy/resource/tasks.json|original/txwy.json"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/resource/global/YoStarEN/resource/tasks.json|original/YoStarEN.json"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/resource/global/YoStarJP/resource/tasks.json|original/YoStarJP.json"
-            "https://raw.githubusercontent.com/MaaAssistantArknights/MaaAssistantArknights/refs/heads/${{ github.ref_name }}/resource/global/YoStarKR/resource/tasks.json|original/YoStarKR.json"
-          )
-
-          mkdir -p original
-
-          printf "%s\n" "${urls[@]}" | xargs -P 6 -I {} bash -c '
-            url=$(echo "{}" | cut -d"|" -f1)
-            filename=$(echo "{}" | cut -d"|" -f2)
-            curl -s -o "$filename" "$url" && echo "Downloaded $filename" || echo "Failed to download $filename" >&2
-          '
-          python3 TaskSorter.py --cn tasks.json --overseas EN:original/YoStarEN.json,JP:original/YoStarJP.json,KR:original/YoStarKR.json,TW:original/txwy.json
-
-      - name: Prettify original JSON
-        uses: Nerixyz/actionsx-prettier@v3-adj
-        with:
-          args: -w original/YoStarEN.json original/YoStarJP.json original/YoStarKR.json original/txwy.json
-
-      - name: Upload Original
-        uses: actions/upload-artifact@v4
-        with:
-          name: original
-          path: ./original
-          compression-level: 0
-
   update-game-resources:
     # In case of rate limitations on the runners/instances, add dependency, by removing the comment
 
-    # needs: [clone-resources-official, clone-resources-overseas, clone-resources-txwy, original-json]
+    # needs: [clone-resources-official, clone-resources-overseas, clone-resources-txwy]
     if: github.repository_owner == 'MaaAssistantArknights'
-    runs-on: windows-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout MAA
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # TL;DR https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9872#issuecomment-2251378371
           # actions/checkout uses ${{ secrets.GITHUB_TOKEN }} by default, meaning all steps will inherit it
@@ -177,125 +140,129 @@ jobs:
           show-progress: false
           fetch-depth: 3
 
-      - name: Restore ResourceUpdater.exe from cache
-        id: cache-resupd
+      - name: Restore ResourceUpdater from cache
+        id: resupd-cache
         uses: actions/cache/restore@v4
         with:
-          key: Resource-updater-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
+          key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
           path: |
-            ./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
-            ./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
+            ./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
+            ./tools/ResourceUpdater/res_updater
 
       - name: Cache MaaDeps
-        if: steps.cache-resupd.outputs.cache-hit != 'true'
-        id: cache-maadeps
+        if: steps.resupd-cache.outputs.cache-hit != 'true'
+        id: maadeps-cache
         uses: actions/cache@v4
         with:
           path: |
             ./MaaDeps
-          key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('./maadeps-download.py') }}
+          key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps
-        if: steps.cache-resupd.outputs.cache-hit != 'true' && steps.cache-maadeps.outputs.cache-hit != 'true'
+        if: steps.resupd-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          python3 maadeps-download.py x64-windows
+          python3 tools/maadeps-download.py arm64-osx
 
-      - name: Add msbuild to PATH
-        if: steps.cache-resupd.outputs.cache-hit != 'true'
-        uses: microsoft/setup-msbuild@v2
-
-      - name: Build Resource Updater
-        if: steps.cache-resupd.outputs.cache-hit != 'true'
+      - name: Config cmake
+        if: steps.resupd-cache.outputs.cache-hit != 'true'
         run: |
-          MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
+          cd tools/ResourceUpdater
+          mkdir -p build
+          cmake -B build -GNinja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DMAADEPS_TRIPLET='maa-arm64-osx' \
+            -DWITH_HASH_VERSION=ON
 
-      - name: Save ResourceUpdater.exe to cache
-        if: always() && steps.cache-resupd.outputs.cache-hit != 'true'
+      - name: Build
+        if: steps.resupd-cache.outputs.cache-hit != 'true'
+        run: |
+          cmake --build tools/ResourceUpdater/build --config Release --parallel $(sysctl -n hw.logicalcpu)
+
+      - name: Install
+        if: steps.resupd-cache.outputs.cache-hit != 'true'
+        run: |
+          cmake --install tools/ResourceUpdater/build --prefix tools/ResourceUpdater --config Release
+
+      - name: Save ResourceUpdater to cache
+        if: always() && steps.resupd-cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
         with:
-          key: Resource-updater-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
+          key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
           path: |
-            ./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
-            ./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
-
-      - name: Download original JSON
-        id: download-original
-        uses: actions/download-artifact@v4.1.8
-        with:
-          name: original
-          path: ./original
+            ./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
+            ./tools/ResourceUpdater/res_updater
 
       - name: Download txwy
         id: download-txwy
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         continue-on-error: true
         with:
           name: txwy
-          path: ./tools/ResourceUpdater/x64/Release/Overseas/tw/gamedata/excel
+          path: ./tools/ResourceUpdater/Overseas/tw/gamedata/excel
 
       - name: Delay txwy
         if: steps.download-txwy.outcome == 'failure'
         run: |
-          Start-Sleep -s 20
+          sleep 10
 
       - name: Re-download txwy
         if: steps.download-txwy.outcome == 'failure'
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         with:
           name: txwy
-          path: ./tools/ResourceUpdater/x64/Release/Overseas/tw/gamedata/excel
+          path: ./tools/ResourceUpdater/Overseas/tw/gamedata/excel
 
       - name: Download Overseas
         id: download-overseas
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         continue-on-error: true
         with:
           name: overseas
-          path: ./tools/ResourceUpdater/x64/Release/Overseas
+          path: ./tools/ResourceUpdater/Overseas
 
       - name: Delay Overseas
         if: steps.download-overseas.outcome == 'failure'
         run: |
-          Start-Sleep -s 20
+          sleep 10
 
       - name: Re-download Overseas
         if: steps.download-overseas.outcome == 'failure'
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         with:
           name: overseas
-          path: ./tools/ResourceUpdater/x64/Release/Overseas
+          path: ./tools/ResourceUpdater/Overseas
 
       - name: Download Official
         id: download-official
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         continue-on-error: true
         with:
           name: official
-          path: ./tools/ResourceUpdater/x64/Release/Official
+          path: ./tools/ResourceUpdater/Official
 
       - name: Delay Official
         if: steps.download-official.outcome == 'failure'
         run: |
-          Start-Sleep -s 20
+          sleep 10
 
       - name: Re-download Official
         if: steps.download-official.outcome == 'failure'
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v5
         with:
           name: official
-          path: ./tools/ResourceUpdater/x64/Release/Official
+          path: ./tools/ResourceUpdater/Official
 
       - name: Run Resource Updater
         run: |
-          ./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
+          ./tools/ResourceUpdater/res_updater
 
       - name: Task Sorting
         id: task_sorting
         run: |
           python3 tools/TaskSorter/TaskSorter.py
-          Write-Output "gitdiff=$(git diff --name-only --diff-filter=ACM 2>$null | Select-String -Pattern '\.json$' -List)" >> $env:GITHUB_OUTPUT
+          echo "gitdiff=$(echo $(git diff --name-only --diff-filter=ACM 2>/dev/null | grep '\.json$'))" >> $GITHUB_OUTPUT
 
       - name: Run prettier
         uses: Nerixyz/actionsx-prettier@v3-adj
@@ -304,11 +271,12 @@ jobs:
 
       - name: Update version.json date if necessary
         id: update_version
-        run: pwsh tools/ResourceUpdater/version.ps1
+        run: |
+          ./tools/ResourceUpdater/version.zsh
 
       - name: Setup python
         if: steps.update_version.outputs.contains_png == 'True'
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
@@ -344,19 +312,19 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add .
 
-          $commit_msg = "${{ github.event.inputs.commit_message }}"
-          if ([string]::IsNullOrWhiteSpace($commit_msg)) {
-            $commit_msg = "chore: Auto Update Game Resources - $(Get-Date -Format 'yyyy-MM-dd')"
-          } else {
-            $commit_msg = $commit_msg.Trim()
-          }
+          commit_msg="${{ github.event.inputs.commit_message }}"
+          if [ -z "$commit_msg" ]; then
+            commit_msg="chore: Auto Update Game Resources - $(date '+%Y-%m-%d')"
+          else
+            commit_msg=$(echo "$commit_msg" | xargs) # Trim whitespace
+          fi
 
-          $run_url = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          run_url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
           git commit -m "$commit_msg" -m "$run_url" -m "[skip changelog]"
-          if ($LASTEXITCODE -eq 0) {
-            Write-Output "have_commits=True" >> $env:GITHUB_OUTPUT
-          }
+          if [ $? -eq 0 ]; then
+            echo "have_commits=True" >> $GITHUB_OUTPUT
+          fi
 
           git pull origin ${{ github.ref_name }} --rebase
 
@@ -367,26 +335,18 @@ jobs:
           branch: ${{ github.ref }}
           github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
 
-      - name: Update OTA resource
-        if: steps.update_version.outputs.update_resources == 'True'
-        env:
-          GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
-        run: |
-          gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
-
-      # - name: Delete cache
-      #   if: always()
+      # - name: Update OTA resource
+      #   if: steps.update_version.outputs.update_resources == 'True'
       #   env:
-      #     GH_TOKEN: ${{ github.token }}
+      #     GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
       #   run: |
-      #     echo "Deleting the cache..."
-      #     gh cache delete
+      #     gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
 
       - name: Add cancelled status
         if: steps.update_version.outputs.changes != 'True' || steps.add_files.outputs.have_commits != 'True'
         uses: andymckay/cancel-action@0.5
 
-    #   - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
-    #     if: steps.add_files.outputs.have_commits == 'True'
-    #     run: |
-    #       gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
+      # - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
+      #   if: steps.add_files.outputs.have_commits == 'True'
+      #   run: |
+      #     gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"

.github/workflows/smoke-testing.yml

@@ -3,119 +3,126 @@ name: smoke-testing
 on:
   push:
     paths:
+      - ".github/workflows/smoke-testing.yml"
       - "3rdparty/include/**"
       - "include/**"
       - "src/Cpp/**"
       - "src/MaaCore/**"
-      - "src/SyncRes/**"
-      - "MAA.sln"
       - "resource/**"
       - "!**/*.md"
+      - "cmake/**"
+      - "CMakeLists.txt"
+      - "tools/maadeps-download.py"
   pull_request:
     paths:
+      - ".github/workflows/smoke-testing.yml"
       - "3rdparty/include/**"
       - "include/**"
       - "src/Cpp/**"
       - "src/MaaCore/**"
-      - "src/SyncRes/**"
-      - "MAA.sln"
       - "resource/**"
       - "!**/*.md"
+      - "cmake/**"
+      - "CMakeLists.txt"
+      - "tools/maadeps-download.py"
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   smoke-testing:
     # Prevent duplicate runs on organization branches with PRs
     if: github.event_name != 'pull_request' ||
       github.event.pull_request.head.repo.full_name !=
       github.event.pull_request.base.repo.full_name
-    runs-on: windows-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
       - name: Generate cache key
         id: cache_key
         run: |
-          Write-Output "key=Smoke-testing-${{ hashFiles('src/Cpp/**', 'src/MaaCore/**', 'src/SyncRes/**', '3rdparty/include/**', 'include/**', 'MAA.sln') }}" >> $env:GITHUB_OUTPUT
+          echo "key=Smoke-testing-${{ hashFiles('src/Cpp/**', 'src/MaaCore/**', '3rdparty/include/**', 'include/**', 'cmake/**', 'CMakeLists.txt', 'tools/maadeps-download.py', 'tools/linux-toolchain-download.py') }}" >> $GITHUB_OUTPUT
 
       - name: Restore cache smoke-testing
-        id: cache-exe
+        id: smoke-cache
         uses: actions/cache/restore@v4
         with:
           key: ${{ steps.cache_key.outputs.key }}
           path: |
-            ./x64/Debug/Sample.exe
-            ./x64/Debug/fastdeploy_ppocr.dll
-            ./x64/Debug/MaaCore.dll
-            ./x64/Debug/onnxruntime_maa.dll
-            ./x64/Debug/opencv_world4d_maa.dll
+            ./install/libfastdeploy_ppocr.dylib
+            ./install/libMaaCore.dylib
+            ./install/libonnxruntime.1.19.2.dylib
+            ./install/libopencv_world4.4.11.0.dylib
+            ./install/smoke_test
 
       - name: Fetch submodules
-        if: steps.cache-exe.outputs.cache-hit != 'true'
+        if: steps.smoke-cache.outputs.cache-hit != 'true'
         run: |
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
 
       - name: Cache MaaDeps
-        if: steps.cache-exe.outputs.cache-hit != 'true'
-        id: cache-maadeps
+        if: steps.smoke-cache.outputs.cache-hit != 'true'
+        id: maadeps-cache
         uses: actions/cache@v4
         with:
-          path: |
-            ./MaaDeps
-          key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('./maadeps-download.py') }}
+          path: ./MaaDeps
+          key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps
-        if: steps.cache-exe.outputs.cache-hit != 'true' && steps.cache-maadeps.outputs.cache-hit != 'true'
+        if: steps.smoke-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          python3 maadeps-download.py x64-windows
+          python3 tools/maadeps-download.py arm64-osx
 
-      - name: Add msbuild to PATH
-        if: steps.cache-exe.outputs.cache-hit != 'true'
-        uses: microsoft/setup-msbuild@v2
-        with:
-          msbuild-architecture: x64
-
-      - name: Build MaaSample
-        if: steps.cache-exe.outputs.cache-hit != 'true'
+      - name: Config cmake
+        if: steps.smoke-cache.outputs.cache-hit != 'true'
         run: |
-          MSBUILD src/Cpp/MaaSample.slnf -t:restore,build -p:Configuration="Debug" -p:Platform="x64" -m
+          mkdir -p build
+          cmake -B build -GNinja \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DMAADEPS_TRIPLET='maa-arm64-osx' \
+            -DBUILD_SMOKE_TEST=ON \
+            -DINSTALL_RESOURCE=ON \
+            -DWITH_HASH_VERSION=ON
 
-      - name: Copy resource to build directory
-        if: steps.cache-exe.outputs.cache-hit == 'true'
+      - name: Build
+        if: steps.smoke-cache.outputs.cache-hit != 'true'
         run: |
-          (robocopy "resource" "x64/Debug/resource" /E /XD "Arknights-Tile-Pos" /MT:4 > $null);
-          if ($LASTEXITCODE -lt 2) { $global:LASTEXITCODE = $null }
-          (robocopy "resource/Arknights-Tile-Pos" "x64/Debug/resource/Arknights-Tile-Pos" "overview.json" > $null);
-          if ($LASTEXITCODE -lt 2) { $global:LASTEXITCODE= $null }
+          cmake --build build --config Debug --parallel $(sysctl -n hw.logicalcpu)
+
+      - name: Install
+        if: steps.smoke-cache.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p install
+          cmake --install build --prefix install --config Debug
+
+      - name: Make link for cache smoke-testing
+        if: steps.smoke-cache.outputs.cache-hit == 'true'
+        run: |
+          ln -s "$(pwd)/resource" install/resource
 
       - name: Run tests
         run: |
-          pwsh tools/SmokeTesting/run_tests.ps1
+          ./tools/SmokeTesting/run_tests.zsh
 
       - name: Save cache smoke-testing (only in dev)
-        if: steps.cache-exe.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
+        if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
         uses: actions/cache/save@v4
         with:
           key: ${{ steps.cache_key.outputs.key }}
           path: |
-            ./x64/Debug/Sample.exe
-            ./x64/Debug/fastdeploy_ppocr.dll
-            ./x64/Debug/MaaCore.dll
-            ./x64/Debug/onnxruntime_maa.dll
-            ./x64/Debug/opencv_world4d_maa.dll
+            ./install/libfastdeploy_ppocr.dylib
+            ./install/libMaaCore.dylib
+            ./install/libonnxruntime.1.19.2.dylib
+            ./install/libopencv_world4.4.11.0.dylib
+            ./install/smoke_test
 
       - name: Upload logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: logs
-          path: ./x64/Debug/debug
+          path: ./install/debug

.github/workflows/stale.yml

@@ -21,7 +21,7 @@ jobs:
       contents: none
     steps:
       - name: Close inactive issues
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: ${{ env.daysBeforeStale }}

.github/workflows/sync-resource.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout MaaAssistantArknights
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
@@ -27,7 +27,7 @@ jobs:
           git show -s
 
       - name: Checkout MaaResource
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: MaaAssistantArknights/MaaResource
           show-progress: false
@@ -49,9 +49,3 @@ jobs:
           git status
           git commit -m "$commit_msg" || exit 0
           git push
-
-      - name: Setup resource update
-        env:
-          GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
-        run: |
-          gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml

.github/workflows/website-workflow.yml

@@ -8,100 +8,65 @@ on:
     paths:
       - ".github/workflows/website-workflow.yml"
       - "docs/**"
-      - "website/**"
   pull_request:
     paths:
       - ".github/workflows/website-workflow.yml"
       - "docs/**"
-      - "website/**"
   workflow_dispatch:
     inputs:
-      deploy-to-prod-env:
-        description: "Deploy to production environment"
+      deploy-to-prod:
+        description: "Deploy to prod"
         default: false
         required: true
         type: boolean
 
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
   build:
-    timeout-minutes: 20
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v5
         with:
           show-progress: false
 
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 10
           run_install: false
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: 24
+          cache: pnpm
+          cache-dependency-path: "./docs/pnpm-lock.yaml"
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
-        working-directory: "./website"
+        working-directory: "./docs"
 
-      - name: Build
+      - name: Build documentation
         run: pnpm run build
-        working-directory: "./website"
+        working-directory: "./docs"
 
-      - name: Upload artifact to GitHub
-        uses: actions/upload-artifact@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          name: dist
-          path: "./website/dist"
+          path: "./docs/.vuepress/dist"
 
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Download website artifacts
-        uses: actions/download-artifact@v4
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v4
+        if: ${{ inputs.deploy-to-prod == true || github.ref == 'refs/heads/master' }}
         with:
-          name: dist
-
-      - name: Set deployment environment
-        id: set-deployment-env
-        run: |
-          if [[ "${{ github.event_name }}" != "workflow_dispatch" && "${{ github.ref }}" == "refs/heads/master" ]] || [[ "${{ github.event.inputs.deploy-to-prod-env }}" == "true" ]]; then
-            echo "AZURE_TARGET_ENV=prod" >> $GITHUB_ENV
-          else
-            echo "AZURE_TARGET_ENV=dev" >> $GITHUB_ENV
-          fi
-
-      - name: Show environment
-        run: echo ${{ env.AZURE_TARGET_ENV }}
-
-      - name: Deploy to Azure (prod)
-        id: deploy-prod
-        uses: Azure/static-web-apps-deploy@v1
-        if: env.AZURE_TARGET_ENV == 'prod'
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          action: "upload"
-          app_location: "."
-          api_location: ""
-          skip_app_build: true
-          skip_api_build: true
-
-      - name: Deploy to Azure (dev)
-        id: deploy-dev
-        uses: Azure/static-web-apps-deploy@v1
-        if: env.AZURE_TARGET_ENV == 'dev'
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          action: "upload"
-          deployment_environment: dev
-          app_location: "."
-          api_location: ""
-          skip_app_build: true
-          skip_api_build: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: "./docs/.vuepress/dist"
+          publish_branch: gh-pages

.gitignore

@@ -451,6 +451,7 @@ tools/RoguelikeRecruitmentTool/output
 # CF 活动关卡（异格夜刀），手动改的地图
 /resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
 /src/MaaWpfGui/FodyWeavers.xml
+*.lnk
 
 # 链接检查缓存
 .lycheecache
@@ -467,3 +468,13 @@ Thumbs.db
 
 # macOS Finder Shit
 .DS_Store
+
+# MaaSupportExtension config
+/config/maa_pi_config.json
+
+# build & install
+build
+install
+
+# pnpm cache
+.pnpm-store

.nuke/build.schema.json

@@ -1,127 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "title": "Build Schema",
-    "$ref": "#/definitions/build",
-    "definitions": {
-        "build": {
-            "type": "object",
-            "properties": {
-                "Continue": {
-                    "type": "boolean",
-                    "description": "Indicates to continue a previously failed build attempt"
-                },
-                "Help": {
-                    "type": "boolean",
-                    "description": "Shows the help text for this build assembly"
-                },
-                "Host": {
-                    "type": "string",
-                    "description": "Host for execution. Default is 'automatic'",
-                    "enum": [
-                        "AppVeyor",
-                        "AzurePipelines",
-                        "Bamboo",
-                        "Bitbucket",
-                        "Bitrise",
-                        "GitHubActions",
-                        "GitLab",
-                        "Jenkins",
-                        "Rider",
-                        "SpaceAutomation",
-                        "TeamCity",
-                        "Terminal",
-                        "TravisCI",
-                        "VisualStudio",
-                        "VSCode"
-                    ]
-                },
-                "NoLogo": {
-                    "type": "boolean",
-                    "description": "Disables displaying the NUKE logo"
-                },
-                "Partition": {
-                    "type": "string",
-                    "description": "Partition to use on CI"
-                },
-                "Plan": {
-                    "type": "boolean",
-                    "description": "Shows the execution plan (HTML)"
-                },
-                "Profile": {
-                    "type": "array",
-                    "description": "Defines the profiles to load",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "Root": {
-                    "type": "string",
-                    "description": "Root directory during build execution"
-                },
-                "Skip": {
-                    "type": "array",
-                    "description": "List of targets to be skipped. Empty list skips all dependencies",
-                    "items": {
-                        "type": "string",
-                        "enum": [
-                            "Default",
-                            "DevBuild",
-                            "DevBuildDefault",
-                            "DevBuildReleaseSimulation",
-                            "ReleaseMaa",
-                            "SetMaaChangeLog",
-                            "SetPackageBundled",
-                            "SetVersion",
-                            "UseClean",
-                            "UseCommitVersion",
-                            "UseMaaChangeLog",
-                            "UseMaaDevBundle",
-                            "UseMaaRelease",
-                            "UsePublishArtifact",
-                            "UsePublishRelease",
-                            "UseRsVersion",
-                            "UseTagVersion",
-                            "WithCompileCoreRelease",
-                            "WithCompileWpfRelease",
-                            "WithSyncRes"
-                        ]
-                    }
-                },
-                "Target": {
-                    "type": "array",
-                    "description": "List of targets to be invoked. Default is '{default_target}'",
-                    "items": {
-                        "type": "string",
-                        "enum": [
-                            "Default",
-                            "DevBuild",
-                            "DevBuildDefault",
-                            "DevBuildReleaseSimulation",
-                            "ReleaseMaa",
-                            "SetMaaChangeLog",
-                            "SetPackageBundled",
-                            "SetVersion",
-                            "UseClean",
-                            "UseCommitVersion",
-                            "UseMaaChangeLog",
-                            "UseMaaDevBundle",
-                            "UseMaaRelease",
-                            "UsePublishArtifact",
-                            "UsePublishRelease",
-                            "UseRsVersion",
-                            "UseTagVersion",
-                            "WithCompileCoreRelease",
-                            "WithCompileWpfRelease",
-                            "WithSyncRes"
-                        ]
-                    }
-                },
-                "Verbosity": {
-                    "type": "string",
-                    "description": "Logging verbosity during build execution. Default is 'Normal'",
-                    "enum": ["Minimal", "Normal", "Quiet", "Verbose"]
-                }
-            }
-        }
-    }
-}

.nuke/parameters.json

@@ -1,4 +0,0 @@
-{
-    "$schema": "./build.schema.json",
-    "Solution": "tools/MaaBuilder.sln"
-}

.pre-commit-config.yaml

@@ -4,26 +4,33 @@ ci:
   autofix_prs: true
 repos:
   - repo: https://github.com/shssoichiro/oxipng
-    rev: v9.1.2
+    rev: v9.1.4
     hooks:
       - id: oxipng
         args: ["-q", "-o", "2", "-s", "--ng"]
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v17.0.1
+    rev: v20.1.0
     hooks:
       - id: clang-format
         files: ^src/MaaCore/.*
         args: ["--assume-filename", ".clang-format"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.5.1
+    rev: v3.5.3
     hooks:
       - id: prettier
-        files: ^((\.github/ISSUE_TEMPLATE|docs|resource|src|tools|website)/.*|\.pre-commit-config\.yaml|package-definition\.json)
+        name: prettier (config files)
+        files: ^((\.github/ISSUE_TEMPLATE|resource|src|tools)/.*|\.pre-commit-config\.yaml|package-definition\.json)
         types_or:
           - yaml
           - json
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.5.3
+    hooks:
+      - id: prettier
+        name: prettier (docs)
+        files: ^docs/.*
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.13.0
+    rev: v0.17.2
     hooks:
       - id: markdownlint-cli2
         files: ^docs/.*|^README\.md$

.prettierignore

@@ -1,10 +1,18 @@
 **/node_modules/
+**/pnpm-lock.yaml
+docs/**/*.md
 
 MaaDeps/
 3rdparty/
 src/maa-cli
 src/MaaMacGui
 
-website/
+# website/
+# docs/
+
 resource/Arknights-Tile-Pos/
 tools/OptimizeTemplates/optimize_templates.json
+
+CITATION.cff
+CHANGELOG.md
+## FUCK FUCK

.prettierrc

@@ -12,6 +12,12 @@
                 "parser": "yaml",
                 "tabWidth": 2
             }
+        },
+        {
+            "files": ["**/*.md"],
+            "options": {
+                "tabWidth": 2
+            }
         }
     ]
 }

.vscode/settings.json

@@ -2,7 +2,8 @@
     "json.schemas": [
         {
             "fileMatch": [
-                "resource/tasks.json"
+                "resource/tasks/**/*.json",
+                "resource/global/**/resource/tasks/**/*.json",
             ],
             "url": "./docs/maa_tasks_schema.json"
         }
@@ -11,5 +12,8 @@
         "MaaDeps/vcpkg/buildtrees": true,
         "MaaDeps/vcpkg/packages": true
     },
+    "files.associations": {
+        "**/resource/tasks/**/*.json": "jsonc"
+    },
     "C_Cpp.exclusionPolicy": "checkFilesAndFolders"
 }

3rdparty/include/meojson/common/array.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <initializer_list>
@@ -5,6 +7,7 @@
 #include <ostream>
 #include <string>
 #include <tuple>
+#include <type_traits>
 #include <vector>
 
 #include "exception.hpp"
@@ -37,37 +40,109 @@ public:
     // explicit basic_array(const basic_value<string_t>& val);
     // explicit basic_array(basic_value<string_t>&& val);
 
-    template <typename collection_t,
-              std::enable_if_t<_utils::is_collection<collection_t> &&
-                                   std::is_constructible_v<value_type, _utils::range_value_t<collection_t>>,
-                               bool> = true>
-    basic_array(collection_t arr)
-        : _array_data(std::make_move_iterator(arr.begin()), std::make_move_iterator(arr.end()))
-    {}
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_member<jsonization_t>::value, bool> = true>
-    basic_array(const jsonization_t& value) : basic_array(value.to_json())
-    {}
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t>::value, bool> = true>
-    basic_array(const jsonization_t& value) : basic_array(ext::jsonization<jsonization_t>().to_json(value))
-    {}
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_to_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_array(const jsonization_t& value)
+        : basic_array(ext::jsonization<string_t, jsonization_t>().to_json(value))
+    {
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_array(const jsonization_t& value)
+        : basic_array(ext::jsonization<string_t, jsonization_t>().to_json_array(value))
+    {
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            std::is_rvalue_reference_v<jsonization_t&&>
+                && _utils::has_move_to_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_move_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_array(jsonization_t&& value)
+        : basic_array(ext::jsonization<string_t, jsonization_t>().move_to_json(std::move(value)))
+    {
+    }
+
+    //template <
+    //    typename jsonization_t,
+    //    std::enable_if_t<
+    //        std::is_rvalue_reference_v<jsonization_t&&>
+    //            && _utils::has_move_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
+    //        bool> = true>
+    //basic_array(jsonization_t&& value)
+    //    : basic_array(
+    //          ext::jsonization<string_t, jsonization_t>().move_to_json_array(std::move(value)))
+    //{
+    //}
 
     ~basic_array() noexcept = default;
 
     bool empty() const noexcept { return _array_data.empty(); }
+
     size_t size() const noexcept { return _array_data.size(); }
+
     bool contains(size_t pos) const { return pos < _array_data.size(); }
+
     bool exists(size_t pos) const { return contains(pos); }
+
     const basic_value<string_t>& at(size_t pos) const;
 
-    string_t dumps(std::optional<size_t> indent = std::nullopt) const { return indent ? format(*indent) : to_string(); }
+    string_t dumps(std::optional<size_t> indent = std::nullopt) const
+    {
+        return indent ? format(*indent) : to_string();
+    }
+
     string_t to_string() const;
+
     string_t format(size_t indent = 4) const { return format(indent, 0); }
+
     template <typename value_t>
     bool all() const;
     template <typename value_t, template <typename...> typename collection_t = std::vector>
     collection_t<value_t> as_collection() const;
+    template <
+        typename value_t,
+        size_t Size,
+        template <typename, size_t> typename fixed_array_t = std::array>
+    fixed_array_t<value_t, Size> as_fixed_array() const;
+    template <typename... elem_ts>
+    std::tuple<elem_ts...> as_tuple() const;
+    template <typename first_t, typename second_t>
+    std::pair<first_t, second_t> as_pair() const;
+
+    template <
+        typename value_t,
+        std::enable_if_t<
+            _utils::has_from_json_array_in_templ_spec<value_t, string_t>::value,
+            bool> = true>
+    value_t as() const&
+    {
+        value_t res;
+        ext::jsonization<string_t, value_t>().from_json_array(*this, res);
+        return res;
+    }
+
+    template <
+        typename value_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_array_in_templ_spec<value_t, string_t>::value,
+            bool> = true>
+    value_t as() &&
+    {
+        value_t res;
+        ext::jsonization<string_t, value_t>().move_from_json_array(std::move(*this), res);
+        return res;
+    }
 
     // Usage: get(key_1, key_2, ..., default_value);
     template <typename... key_then_default_value_t>
@@ -112,37 +187,93 @@ public:
 
     basic_array<string_t>& operator=(const basic_array<string_t>&) = default;
     basic_array<string_t>& operator=(basic_array<string_t>&&) noexcept = default;
-    template <typename value_t, std::enable_if_t<std::is_convertible_v<value_t, basic_array<string_t>>, bool> = true>
+
+    template <
+        typename value_t,
+        std::enable_if_t<std::is_convertible_v<value_t, basic_array<string_t>>, bool> = true>
     basic_array<string_t>& operator=(value_t rhs)
     {
         return *this = basic_array<string_t>(std::move(rhs));
     }
 
     bool operator==(const basic_array<string_t>& rhs) const;
+
     bool operator!=(const basic_array<string_t>& rhs) const { return !(*this == rhs); }
 
-    template <typename value_t, template <typename...> typename collection_t = std::vector,
-              std::enable_if_t<_utils::is_collection<collection_t<value_t>>, bool> = true>
+    template <
+        typename value_t,
+        template <typename...> typename collection_t = std::vector,
+        std::enable_if_t<_utils::is_collection<collection_t<value_t>>, bool> = true>
     explicit operator collection_t<value_t>() const
     {
         return as_collection<value_t, collection_t>();
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_member<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <
+        typename value_t,
+        size_t Size,
+        template <typename, size_t> typename fixed_array_t = std::array,
+        std::enable_if_t<_utils::is_fixed_array<fixed_array_t<value_t, Size>>, bool> = true>
+    explicit operator fixed_array_t<value_t, Size>() const
+    {
+        return as<fixed_array_t<value_t, Size>>();
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() const&
     {
         jsonization_t dst {};
-        if (!dst.from_json(*this)) {
+        if (!ext::jsonization<string_t, jsonization_t>().from_json(*this, dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() const&
     {
         jsonization_t dst {};
-        if (!ext::jsonization<jsonization_t>().from_json(*this, dst)) {
+        if (!ext::jsonization<string_t, jsonization_t>().from_json_array(*this, dst)) {
+            throw exception("Wrong JSON");
+        }
+        return dst;
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_move_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() &&
+    {
+        jsonization_t dst {};
+        if (!ext::jsonization<string_t, jsonization_t>().from_json(std::move(*this), dst)) {
+            throw exception("Wrong JSON");
+        }
+        return dst;
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() &&
+    {
+        jsonization_t dst {};
+        if (!ext::jsonization<string_t, jsonization_t>().move_from_json_array(
+                std::move(*this),
+                dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
@@ -150,8 +281,9 @@ public:
 
 private:
     template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-    auto get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-             std::index_sequence<keys_indexes_t...>) const;
+    auto
+        get(std::tuple<key_then_default_value_t...> keys_then_default_value,
+            std::index_sequence<keys_indexes_t...>) const;
     template <typename value_t, typename... rest_keys_t>
     auto get_helper(const value_t& default_value, size_t pos, rest_keys_t&&... rest) const;
     template <typename value_t>
@@ -164,15 +296,20 @@ private:
 };
 
 template <typename string_t>
-inline basic_array<string_t>::basic_array(std::initializer_list<value_type> init_list) : _array_data(init_list)
-{}
+inline basic_array<string_t>::basic_array(std::initializer_list<value_type> init_list)
+    : _array_data(init_list)
+{
+}
 
 template <typename string_t>
-inline basic_array<string_t>::basic_array(typename raw_array::size_type size) : _array_data(size)
-{}
+inline basic_array<string_t>::basic_array(typename raw_array::size_type size)
+    : _array_data(size)
+{
+}
 
 // template <typename string_t>
-// inline basic_array<string_t>::basic_array(const basic_value<string_t>& val) : basic_array<string_t>(val.as_array())
+// inline basic_array<string_t>::basic_array(const basic_value<string_t>& val) :
+// basic_array<string_t>(val.as_array())
 //{}
 //
 // template <typename string_t>
@@ -202,8 +339,9 @@ template <typename string_t>
 template <typename... args_t>
 inline decltype(auto) basic_array<string_t>::emplace_back(args_t&&... args)
 {
-    static_assert(std::is_constructible_v<value_type, args_t...>,
-                  "Parameter can't be used to construct a raw_array::value_type");
+    static_assert(
+        std::is_constructible_v<value_type, args_t...>,
+        "Parameter can't be used to construct a raw_array::value_type");
     return _array_data.emplace_back(std::forward<args_t>(args)...);
 }
 
@@ -264,65 +402,65 @@ inline bool basic_array<string_t>::all() const
     return true;
 }
 
-namespace _as_collection_helper
-{
-    template <typename T>
-    class has_emplace_back
-    {
-        template <typename U>
-        static auto test(int) -> decltype(std::declval<U>().emplace_back(), std::true_type());
-
-        template <typename U>
-        static std::false_type test(...);
-
-    public:
-        static constexpr bool value = decltype(test<T>(0))::value;
-    };
-}
-
 template <typename string_t>
 template <typename value_t, template <typename...> typename collection_t>
 inline collection_t<value_t> basic_array<string_t>::as_collection() const
 {
-    collection_t<value_t> result;
-    if constexpr (_as_collection_helper::has_emplace_back<collection_t<value_t>>::value) {
-        for (const auto& elem : _array_data) {
-            result.emplace_back(elem.template as<value_t>());
-        }
-    }
-    else {
-        for (const auto& elem : _array_data) {
-            result.emplace(elem.template as<value_t>());
-        }
-    }
-    return result;
+    return as<collection_t<value_t>>();
+}
+
+template <typename string_t>
+template <typename value_t, size_t Size, template <typename, size_t> typename fixed_array_t>
+inline fixed_array_t<value_t, Size> basic_array<string_t>::as_fixed_array() const
+{
+    return as<fixed_array_t<value_t, Size>>();
+}
+
+template <typename string_t>
+template <typename... elem_ts>
+inline std::tuple<elem_ts...> basic_array<string_t>::as_tuple() const
+{
+    return as<std::tuple<elem_ts...>>();
+}
+
+template <typename string_t>
+template <typename first_t, typename second_t>
+inline std::pair<first_t, second_t> basic_array<string_t>::as_pair() const
+{
+    return as<std::pair<first_t, second_t>>();
 }
 
 template <typename string_t>
 template <typename... key_then_default_value_t>
 inline auto basic_array<string_t>::get(key_then_default_value_t&&... keys_then_default_value) const
 {
-    return get(std::forward_as_tuple(keys_then_default_value...),
-               std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
+    return get(
+        std::forward_as_tuple(keys_then_default_value...),
+        std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
 }
 
 template <typename string_t>
 template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-inline auto basic_array<string_t>::get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-                                       std::index_sequence<keys_indexes_t...>) const
+inline auto basic_array<string_t>::get(
+    std::tuple<key_then_default_value_t...> keys_then_default_value,
+    std::index_sequence<keys_indexes_t...>) const
 {
     constexpr unsigned long default_value_index = sizeof...(key_then_default_value_t) - 1;
-    return get_helper(std::get<default_value_index>(keys_then_default_value),
-                      std::get<keys_indexes_t>(keys_then_default_value)...);
+    return get_helper(
+        std::get<default_value_index>(keys_then_default_value),
+        std::get<keys_indexes_t>(keys_then_default_value)...);
 }
 
 template <typename string_t>
 template <typename value_t, typename... rest_keys_t>
-inline auto basic_array<string_t>::get_helper(const value_t& default_value, size_t pos, rest_keys_t&&... rest) const
+inline auto basic_array<string_t>::get_helper(
+    const value_t& default_value,
+    size_t pos,
+    rest_keys_t&&... rest) const
 {
-    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t> ||
-                             std::is_same_v<basic_array<string_t>, value_t> ||
-                             std::is_same_v<basic_object<string_t>, value_t>;
+    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
+                             || std::is_same_v<basic_array<string_t>, value_t>
+                             || std::is_same_v<basic_object<string_t>, value_t>;
     constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
 
     if (!contains(pos)) {
@@ -341,9 +479,9 @@ template <typename string_t>
 template <typename value_t>
 inline auto basic_array<string_t>::get_helper(const value_t& default_value, size_t pos) const
 {
-    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t> ||
-                             std::is_same_v<basic_array<string_t>, value_t> ||
-                             std::is_same_v<basic_object<string_t>, value_t>;
+    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
+                             || std::is_same_v<basic_array<string_t>, value_t>
+                             || std::is_same_v<basic_object<string_t>, value_t>;
     constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
 
     if (!contains(pos)) {
@@ -382,7 +520,8 @@ inline std::optional<value_t> basic_array<string_t>::find(size_t pos) const
         return std::nullopt;
     }
     const auto& val = _array_data.at(pos);
-    return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>()) : std::nullopt;
+    return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>())
+                                      : std::nullopt;
 }
 
 template <typename string_t>
@@ -434,25 +573,29 @@ inline typename basic_array<string_t>::reverse_iterator basic_array<string_t>::r
 }
 
 template <typename string_t>
-inline typename basic_array<string_t>::const_reverse_iterator basic_array<string_t>::rbegin() const noexcept
+inline typename basic_array<string_t>::const_reverse_iterator
+    basic_array<string_t>::rbegin() const noexcept
 {
     return _array_data.rbegin();
 }
 
 template <typename string_t>
-inline typename basic_array<string_t>::const_reverse_iterator basic_array<string_t>::rend() const noexcept
+inline typename basic_array<string_t>::const_reverse_iterator
+    basic_array<string_t>::rend() const noexcept
 {
     return _array_data.rend();
 }
 
 template <typename string_t>
-inline typename basic_array<string_t>::const_reverse_iterator basic_array<string_t>::crbegin() const noexcept
+inline typename basic_array<string_t>::const_reverse_iterator
+    basic_array<string_t>::crbegin() const noexcept
 {
     return _array_data.crbegin();
 }
 
 template <typename string_t>
-inline typename basic_array<string_t>::const_reverse_iterator basic_array<string_t>::crend() const noexcept
+inline typename basic_array<string_t>::const_reverse_iterator
+    basic_array<string_t>::crend() const noexcept
 {
     return _array_data.crend();
 }
@@ -470,7 +613,8 @@ inline const basic_value<string_t>& basic_array<string_t>::operator[](size_t pos
 }
 
 template <typename string_t>
-inline basic_array<string_t> basic_array<string_t>::operator+(const basic_array<string_t>& rhs) const&
+inline basic_array<string_t>
+    basic_array<string_t>::operator+(const basic_array<string_t>& rhs) const&
 {
     basic_array<string_t> temp = *this;
     temp._array_data.insert(_array_data.end(), rhs.begin(), rhs.end());
@@ -481,8 +625,10 @@ template <typename string_t>
 inline basic_array<string_t> basic_array<string_t>::operator+(basic_array<string_t>&& rhs) const&
 {
     basic_array<string_t> temp = *this;
-    temp._array_data.insert(_array_data.end(), std::make_move_iterator(rhs.begin()),
-                            std::make_move_iterator(rhs.end()));
+    temp._array_data.insert(
+        _array_data.end(),
+        std::make_move_iterator(rhs.begin()),
+        std::make_move_iterator(rhs.end()));
     return temp;
 }
 
@@ -496,7 +642,10 @@ inline basic_array<string_t> basic_array<string_t>::operator+(const basic_array<
 template <typename string_t>
 inline basic_array<string_t> basic_array<string_t>::operator+(basic_array<string_t>&& rhs) &&
 {
-    _array_data.insert(_array_data.end(), std::make_move_iterator(rhs.begin()), std::make_move_iterator(rhs.end()));
+    _array_data.insert(
+        _array_data.end(),
+        std::make_move_iterator(rhs.begin()),
+        std::make_move_iterator(rhs.end()));
     return std::move(*this);
 }
 
@@ -510,7 +659,10 @@ inline basic_array<string_t>& basic_array<string_t>::operator+=(const basic_arra
 template <typename string_t>
 inline basic_array<string_t>& basic_array<string_t>::operator+=(basic_array<string_t>&& rhs)
 {
-    _array_data.insert(_array_data.end(), std::make_move_iterator(rhs.begin()), std::make_move_iterator(rhs.end()));
+    _array_data.insert(
+        _array_data.end(),
+        std::make_move_iterator(rhs.begin()),
+        std::make_move_iterator(rhs.end()));
     return *this;
 }
 
@@ -520,11 +672,14 @@ inline bool basic_array<string_t>::operator==(const basic_array<string_t>& rhs)
     return _array_data == rhs._array_data;
 }
 
-template <typename ostream_t, typename string_t,
-          typename std_ostream_t =
-              std::basic_ostream<typename string_t::value_type, std::char_traits<typename string_t::value_type>>,
-          typename enable_t =
-              std::enable_if_t<std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
+template <
+    typename ostream_t,
+    typename string_t,
+    typename std_ostream_t = std::basic_ostream<
+        typename string_t::value_type,
+        std::char_traits<typename string_t::value_type>>,
+    typename enable_t = std::enable_if_t<
+        std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
 ostream_t& operator<<(ostream_t& out, const basic_array<string_t>& arr)
 {
     out << arr.format();

3rdparty/include/meojson/common/exception.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <exception>
@@ -9,7 +11,11 @@ class exception : public std::exception
 {
 public:
     exception() = default;
-    exception(const std::string& msg) : _what(msg) {}
+
+    exception(const std::string& msg)
+        : _what(msg)
+    {
+    }
 
     exception(const exception&) = default;
     exception& operator=(const exception&) = default;
@@ -18,7 +24,10 @@ public:
 
     virtual ~exception() noexcept override = default;
 
-    virtual const char* what() const noexcept override { return _what.empty() ? "Unknown exception" : _what.c_str(); }
+    virtual const char* what() const noexcept override
+    {
+        return _what.empty() ? "Unknown exception" : _what.c_str();
+    }
 
 protected:
     std::string _what;

3rdparty/include/meojson/common/object.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <initializer_list>
@@ -36,36 +38,101 @@ public:
     // explicit basic_object(const basic_value<string_t>& val);
     // explicit basic_object(basic_value<string_t>&& val);
 
-    template <typename map_t, std::enable_if_t<_utils::is_map<map_t> &&
-                                                   std::is_constructible_v<value_type, _utils::range_value_t<map_t>>,
-                                               bool> = true>
-    basic_object(map_t map) : _object_data(std::make_move_iterator(map.begin()), std::make_move_iterator(map.end()))
-    {}
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_member<jsonization_t>::value, bool> = true>
-    basic_object(const jsonization_t& value) : basic_object(value.to_json())
-    {}
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t>::value, bool> = true>
-    basic_object(const jsonization_t& value) : basic_object(ext::jsonization<jsonization_t>().to_json(value))
-    {}
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_to_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_object(const jsonization_t& value)
+        : basic_object(ext::jsonization<string_t, jsonization_t>().to_json(value))
+    {
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_object(const jsonization_t& value)
+        : basic_object(ext::jsonization<string_t, jsonization_t>().to_json_object(value))
+    {
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            std::is_rvalue_reference_v<jsonization_t&&>
+                && _utils::has_move_to_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_move_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_object(jsonization_t&& value)
+        : basic_object(ext::jsonization<string_t, jsonization_t>().move_to_json(std::move(value)))
+    {
+    }
+
+    //template <
+    //    typename jsonization_t,
+    //    std::enable_if_t<
+    //        std::is_rvalue_reference_v<jsonization_t&&>
+    //            && _utils::has_move_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
+    //        bool> = true>
+    //basic_object(jsonization_t&& value)
+    //    : basic_object(
+    //          ext::jsonization<string_t, jsonization_t>().move_to_json_object(std::move(value)))
+    //{
+    //}
 
     ~basic_object() = default;
 
     bool empty() const noexcept { return _object_data.empty(); }
+
     size_t size() const noexcept { return _object_data.size(); }
+
     bool contains(const string_t& key) const;
+
     bool exists(const string_t& key) const { return contains(key); }
+
     const basic_value<string_t>& at(const string_t& key) const;
 
-    string_t dumps(std::optional<size_t> indent = std::nullopt) const { return indent ? format(*indent) : to_string(); }
+    string_t dumps(std::optional<size_t> indent = std::nullopt) const
+    {
+        return indent ? format(*indent) : to_string();
+    }
+
     string_t to_string() const;
+
     string_t format(size_t indent = 4) const { return format(indent, 0); }
+
     template <typename value_t>
     bool all() const;
     template <typename value_t, template <typename...> typename map_t = std::map>
     map_t<string_t, value_t> as_map() const;
 
+    template <
+        typename value_t,
+        std::enable_if_t<
+            _utils::has_from_json_object_in_templ_spec<value_t, string_t>::value,
+            bool> = true>
+    value_t as() const&
+    {
+        value_t res;
+        ext::jsonization<string_t, value_t>().from_json_object(*this, res);
+        return res;
+    }
+
+    template <
+        typename value_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_object_in_templ_spec<value_t, string_t>::value,
+            bool> = true>
+    value_t as() &&
+    {
+        value_t res;
+        ext::jsonization<string_t, value_t>().move_from_json_object(std::move(*this), res);
+        return res;
+    }
+
     // Usage: get(key_1, key_2, ..., default_value);
     template <typename... key_then_default_value_t>
     auto get(key_then_default_value_t&&... keys_then_default_value) const;
@@ -102,37 +169,83 @@ public:
 
     basic_object<string_t>& operator=(const basic_object<string_t>&) = default;
     basic_object<string_t>& operator=(basic_object<string_t>&&) = default;
-    template <typename value_t, std::enable_if_t<std::is_convertible_v<value_t, basic_object<string_t>>, bool> = true>
+
+    template <
+        typename value_t,
+        std::enable_if_t<std::is_convertible_v<value_t, basic_object<string_t>>, bool> = true>
     basic_object<string_t>& operator=(value_t rhs)
     {
         return *this = basic_object<string_t>(std::move(rhs));
     }
 
     bool operator==(const basic_object<string_t>& rhs) const;
+
     bool operator!=(const basic_object<string_t>& rhs) const { return !(*this == rhs); }
 
-    template <typename value_t, template <typename...> typename map_t = std::map,
-              std::enable_if_t<_utils::is_map<map_t<string_t, value_t>>, bool> = true>
+    template <
+        typename value_t,
+        template <typename...> typename map_t = std::map,
+        std::enable_if_t<_utils::is_map<map_t<string_t, value_t>>, bool> = true>
     explicit operator map_t<string_t, value_t>() const
     {
         return as_map<value_t, map_t>();
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_member<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() const&
     {
         jsonization_t dst {};
-        if (!dst.from_json(*this)) {
+        if (!ext::jsonization<string_t, jsonization_t>().from_json(*this, dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() const&
     {
         jsonization_t dst {};
-        if (!ext::jsonization<jsonization_t>().from_json(*this, dst)) {
+        if (!ext::jsonization<string_t, jsonization_t>().from_json_object(*this, dst)) {
+            throw exception("Wrong JSON");
+        }
+        return dst;
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_in_templ_spec<jsonization_t, string_t>::value
+                && !_utils::has_move_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() &&
+    {
+        jsonization_t dst {};
+        if (!ext::jsonization<string_t, jsonization_t>().from_json(std::move(*this), dst)) {
+            throw exception("Wrong JSON");
+        }
+        return dst;
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() &&
+    {
+        jsonization_t dst {};
+        if (!ext::jsonization<string_t, jsonization_t>().move_from_json_object(
+                std::move(*this),
+                dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
@@ -140,8 +253,9 @@ public:
 
 private:
     template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-    auto get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-             std::index_sequence<keys_indexes_t...>) const;
+    auto
+        get(std::tuple<key_then_default_value_t...> keys_then_default_value,
+            std::index_sequence<keys_indexes_t...>) const;
     template <typename value_t, typename... rest_keys_t>
     auto get_helper(const value_t& default_value, const string_t& key, rest_keys_t&&... rest) const;
     template <typename value_t>
@@ -155,8 +269,11 @@ private:
 
 template <typename string_t>
 inline basic_object<string_t>::basic_object(std::initializer_list<value_type> init_list)
-    : _object_data(std::make_move_iterator(init_list.begin()), std::make_move_iterator(init_list.end()))
-{}
+    : _object_data(
+          std::make_move_iterator(init_list.begin()),
+          std::make_move_iterator(init_list.end()))
+{
+}
 
 // template <typename string_t>
 // inline basic_object<string_t>::basic_object(const basic_value<string_t>& val) :
@@ -202,9 +319,10 @@ template <typename string_t>
 template <typename... args_t>
 inline decltype(auto) basic_object<string_t>::emplace(args_t&&... args)
 {
-    static_assert(std::is_constructible_v<value_type, args_t...>,
-                  "Parameter can't be used to construct a raw_object::value_type");
-    return _object_data.emplace(std::forward<args_t>(args)...);
+    static_assert(
+        std::is_constructible_v<value_type, args_t...>,
+        "Parameter can't be used to construct a raw_object::value_type");
+    return _object_data.insert_or_assign(std::forward<args_t>(args)...);
 }
 
 template <typename string_t>
@@ -220,7 +338,8 @@ inline string_t basic_object<string_t>::to_string() const
     string_t str { '{' };
     for (auto iter = _object_data.cbegin(); iter != _object_data.cend();) {
         const auto& [key, val] = *iter;
-        str += char_t('"') + _utils::unescape_string(key) + string_t { '\"', ':' } + val.to_string();
+        str +=
+            char_t('"') + _utils::unescape_string(key) + string_t { '\"', ':' } + val.to_string();
         if (++iter != _object_data.cend()) {
             str += ',';
         }
@@ -238,8 +357,8 @@ inline string_t basic_object<string_t>::format(size_t indent, size_t indent_time
     string_t str { '{', '\n' };
     for (auto iter = _object_data.cbegin(); iter != _object_data.cend();) {
         const auto& [key, val] = *iter;
-        str += body_indent + char_t('"') + _utils::unescape_string(key) + string_t { '\"', ':', ' ' } +
-               val.format(indent, indent_times + 1);
+        str += body_indent + char_t('"') + _utils::unescape_string(key)
+               + string_t { '\"', ':', ' ' } + val.format(indent, indent_times + 1);
         if (++iter != _object_data.cend()) {
             str += ',';
         }
@@ -265,39 +384,40 @@ template <typename string_t>
 template <typename value_t, template <typename...> typename map_t>
 inline map_t<string_t, value_t> basic_object<string_t>::as_map() const
 {
-    map_t<string_t, value_t> result;
-    for (const auto& [key, val] : _object_data) {
-        result.emplace(key, val.template as<value_t>());
-    }
-    return result;
+    return as<map_t<string_t, value_t>>();
 }
 
 template <typename string_t>
 template <typename... key_then_default_value_t>
 inline auto basic_object<string_t>::get(key_then_default_value_t&&... keys_then_default_value) const
 {
-    return get(std::forward_as_tuple(keys_then_default_value...),
-               std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
+    return get(
+        std::forward_as_tuple(keys_then_default_value...),
+        std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
 }
 
 template <typename string_t>
 template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-inline auto basic_object<string_t>::get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-                                        std::index_sequence<keys_indexes_t...>) const
+inline auto basic_object<string_t>::get(
+    std::tuple<key_then_default_value_t...> keys_then_default_value,
+    std::index_sequence<keys_indexes_t...>) const
 {
     constexpr unsigned long default_value_index = sizeof...(key_then_default_value_t) - 1;
-    return get_helper(std::get<default_value_index>(keys_then_default_value),
-                      std::get<keys_indexes_t>(keys_then_default_value)...);
+    return get_helper(
+        std::get<default_value_index>(keys_then_default_value),
+        std::get<keys_indexes_t>(keys_then_default_value)...);
 }
 
 template <typename string_t>
 template <typename value_t, typename... rest_keys_t>
-inline auto basic_object<string_t>::get_helper(const value_t& default_value, const string_t& key,
-                                               rest_keys_t&&... rest) const
+inline auto basic_object<string_t>::get_helper(
+    const value_t& default_value,
+    const string_t& key,
+    rest_keys_t&&... rest) const
 {
-    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t> ||
-                             std::is_same_v<basic_array<string_t>, value_t> ||
-                             std::is_same_v<basic_object<string_t>, value_t>;
+    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
+                             || std::is_same_v<basic_array<string_t>, value_t>
+                             || std::is_same_v<basic_object<string_t>, value_t>;
     constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
 
     if (!contains(key)) {
@@ -314,11 +434,12 @@ inline auto basic_object<string_t>::get_helper(const value_t& default_value, con
 
 template <typename string_t>
 template <typename value_t>
-inline auto basic_object<string_t>::get_helper(const value_t& default_value, const string_t& key) const
+inline auto
+    basic_object<string_t>::get_helper(const value_t& default_value, const string_t& key) const
 {
-    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t> ||
-                             std::is_same_v<basic_array<string_t>, value_t> ||
-                             std::is_same_v<basic_object<string_t>, value_t>;
+    constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
+                             || std::is_same_v<basic_array<string_t>, value_t>
+                             || std::is_same_v<basic_object<string_t>, value_t>;
     constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
 
     if (!contains(key)) {
@@ -358,7 +479,8 @@ inline std::optional<value_t> basic_object<string_t>::find(const string_t& key)
         return std::nullopt;
     }
     const auto& val = iter->second;
-    return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>()) : std::nullopt;
+    return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>())
+                                      : std::nullopt;
 }
 
 template <typename string_t>
@@ -374,7 +496,8 @@ inline typename basic_object<string_t>::iterator basic_object<string_t>::end() n
 }
 
 template <typename string_t>
-inline typename basic_object<string_t>::const_iterator basic_object<string_t>::begin() const noexcept
+inline typename basic_object<string_t>::const_iterator
+    basic_object<string_t>::begin() const noexcept
 {
     return _object_data.begin();
 }
@@ -386,7 +509,8 @@ inline typename basic_object<string_t>::const_iterator basic_object<string_t>::e
 }
 
 template <typename string_t>
-inline typename basic_object<string_t>::const_iterator basic_object<string_t>::cbegin() const noexcept
+inline typename basic_object<string_t>::const_iterator
+    basic_object<string_t>::cbegin() const noexcept
 {
     return _object_data.cbegin();
 }
@@ -410,7 +534,8 @@ inline basic_value<string_t>& basic_object<string_t>::operator[](string_t&& key)
 }
 
 template <typename string_t>
-inline basic_object<string_t> basic_object<string_t>::operator|(const basic_object<string_t>& rhs) const&
+inline basic_object<string_t>
+    basic_object<string_t>::operator|(const basic_object<string_t>& rhs) const&
 {
     basic_object<string_t> temp = *this;
     temp._object_data.insert(rhs.begin(), rhs.end());
@@ -422,12 +547,15 @@ inline basic_object<string_t> basic_object<string_t>::operator|(basic_object<str
 {
     basic_object<string_t> temp = *this;
     // temp._object_data.merge(std::move(rhs._object_data));
-    temp._object_data.insert(std::make_move_iterator(rhs.begin()), std::make_move_iterator(rhs.end()));
+    temp._object_data.insert(
+        std::make_move_iterator(rhs.begin()),
+        std::make_move_iterator(rhs.end()));
     return temp;
 }
 
 template <typename string_t>
-inline basic_object<string_t> basic_object<string_t>::operator|(const basic_object<string_t>& rhs) &&
+inline basic_object<string_t>
+    basic_object<string_t>::operator|(const basic_object<string_t>& rhs) &&
 {
     _object_data.insert(rhs.begin(), rhs.end());
     return std::move(*this);
@@ -461,11 +589,14 @@ inline bool basic_object<string_t>::operator==(const basic_object<string_t>& rhs
     return _object_data == rhs._object_data;
 }
 
-template <typename ostream_t, typename string_t,
-          typename std_ostream_t =
-              std::basic_ostream<typename string_t::value_type, std::char_traits<typename string_t::value_type>>,
-          typename enable_t =
-              std::enable_if_t<std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
+template <
+    typename ostream_t,
+    typename string_t,
+    typename std_ostream_t = std::basic_ostream<
+        typename string_t::value_type,
+        std::char_traits<typename string_t::value_type>>,
+    typename enable_t = std::enable_if_t<
+        std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
 ostream_t& operator<<(ostream_t& out, const basic_object<string_t>& obj)
 {
     out << obj.format();

3rdparty/include/meojson/common/serialization.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <type_traits>
@@ -9,96 +11,101 @@ namespace json
 {
 namespace _serialization_helper
 {
-    template <typename in_t, typename serializer_t>
-    class is_serializable
-    {
-        template <typename U>
-        static auto test(int) -> decltype(std::declval<serializer_t>()(std::declval<U>()), std::true_type());
+template <typename in_t, typename serializer_t>
+class is_serializable
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<serializer_t>()(std::declval<U>()), std::true_type());
 
-        template <typename U>
-        static std::false_type test(...);
+    template <typename U>
+    static std::false_type test(...);
 
-    public:
-        static constexpr bool value = decltype(test<in_t>(0))::value;
-    };
+public:
+    static constexpr bool value = decltype(test<in_t>(0))::value;
+};
 
-    struct empty_serializer
-    {
-        // sample:
-        // json::value operator()(const type_1&) const { return ...; }
-        // json::value operator()(const type_2&) const { return ...; }
-        // json::value operator()(const type_3&) const { return ...; }
-    };
+struct empty_serializer
+{
+    // sample:
+    // json::value operator()(const type_1&) const { return ...; }
+    // json::value operator()(const type_2&) const { return ...; }
+    // json::value operator()(const type_3&) const { return ...; }
+};
 
-    template <typename T>
-    void unable_to_serialize()
-    {
-        static_assert(!sizeof(T), "Unable to serialize T. "
+template <typename T>
+void unable_to_serialize()
+{
+    static_assert(
+        !sizeof(T),
+        "Unable to serialize T. "
 #ifdef _MSC_VER
-                                  "See T below: " __FUNCSIG__
+        "See T below: " __FUNCSIG__
 #else
-        // "See T below: " __PRETTY_FUNCTION__
+    // "See T below: " __PRETTY_FUNCTION__
 
 #endif
-        );
-    }
+    );
+}
 }
 
 namespace _serialization_helper
 {
-    template <typename out_t, typename deserializer_t, typename string_t = default_string_t>
-    class is_deserializable
-    {
-        template <typename U>
-        static auto test(int)
-            -> decltype(std::declval<deserializer_t>()(std::declval<basic_value<string_t>>(), std::declval<U&>()),
-                        std::true_type());
+template <typename out_t, typename deserializer_t, typename string_t = default_string_t>
+class is_deserializable
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<deserializer_t>()(std::declval<basic_value<string_t>>(), std::declval<U&>()), std::true_type());
 
-        template <typename U>
-        static std::false_type test(...);
+    template <typename U>
+    static std::false_type test(...);
 
-    public:
-        static constexpr bool value = decltype(test<out_t>(0))::value;
-    };
+public:
+    static constexpr bool value = decltype(test<out_t>(0))::value;
+};
 
-    struct empty_deserializer
-    {
-        // sample:
-        // bool operator()(const json::value&, type_1&) const { return ...; }
-        // bool operator()(const json::value&, type_2&) const { return ...; }
-        // bool operator()(const json::value&, type_3&) const { return ...; }
-    };
+struct empty_deserializer
+{
+    // sample:
+    // bool operator()(const json::value&, type_1&) const { return ...; }
+    // bool operator()(const json::value&, type_2&) const { return ...; }
+    // bool operator()(const json::value&, type_3&) const { return ...; }
+};
 
-    template <typename T>
-    void unable_to_deserialize()
-    {
-        static_assert(!sizeof(T), "Unable to deserialize T. "
+template <typename T>
+void unable_to_deserialize()
+{
+    static_assert(
+        !sizeof(T),
+        "Unable to deserialize T. "
 #ifdef _MSC_VER
-                                  "See T below: " __FUNCSIG__
+        "See T below: " __FUNCSIG__
 #else
-        // "See T below: " __PRETTY_FUNCTION__
+    // "See T below: " __PRETTY_FUNCTION__
 
 #endif
-        );
-    }
+    );
+}
 }
 
-template <typename in_t, typename serializer_t = _serialization_helper::empty_serializer,
-          typename string_t = default_string_t>
+template <
+    typename in_t,
+    typename serializer_t = _serialization_helper::empty_serializer,
+    typename string_t = default_string_t>
 basic_value<string_t> serialize(in_t&& in, const serializer_t& serializer = {})
 {
     if constexpr (_serialization_helper::is_serializable<in_t, serializer_t>::value) {
         return serializer(std::forward<in_t>(in));
     }
-    else if constexpr (std::is_constructible_v<basic_value<string_t>, in_t>) {
-        return basic_value<string_t>(std::forward<in_t>(in));
-    }
-    else if constexpr (_utils::is_collection<std::decay_t<in_t>>) {
+    else if constexpr (
+        _utils::is_collection<std::decay_t<in_t>> || _utils::is_fixed_array<std::decay_t<in_t>>) {
         basic_array<string_t> arr;
         for (auto&& elem : in) {
             using elem_t = decltype(elem);
 
-            auto j_elem = serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
+            auto j_elem =
+                serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
             arr.emplace_back(std::move(j_elem));
         }
         return arr;
@@ -109,27 +116,32 @@ basic_value<string_t> serialize(in_t&& in, const serializer_t& serializer = {})
             using key_t = decltype(key);
             using elem_t = decltype(elem);
 
-            auto j_elem = serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
+            auto j_elem =
+                serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
             obj.emplace(std::forward<key_t>(key), std::move(j_elem));
         }
         return obj;
     }
+    else if constexpr (std::is_constructible_v<basic_value<string_t>, in_t>) {
+        return basic_value<string_t>(std::forward<in_t>(in));
+    }
     else {
         _serialization_helper::unable_to_serialize<in_t>();
     }
 }
 
-template <typename out_t, typename deserializer_t = _serialization_helper::empty_deserializer,
-          typename string_t = default_string_t>
-bool deserialize(const basic_value<string_t>& in, out_t& out, const deserializer_t& deserializer = {})
+template <
+    typename out_t,
+    typename deserializer_t = _serialization_helper::empty_deserializer,
+    typename string_t = default_string_t>
+bool deserialize(
+    const basic_value<string_t>& in,
+    out_t& out,
+    const deserializer_t& deserializer = {})
 {
     if constexpr (_serialization_helper::is_deserializable<out_t, deserializer_t>::value) {
         return deserializer(in, out);
     }
-    else if constexpr (std::is_constructible_v<out_t, basic_value<string_t>>) {
-        out = out_t(in);
-        return true;
-    }
     else if constexpr (_utils::is_collection<std::decay_t<out_t>>) {
         if (!in.is_array()) {
             return false;
@@ -149,20 +161,45 @@ bool deserialize(const basic_value<string_t>& in, out_t& out, const deserializer
         }
         return true;
     }
-    else if constexpr (_utils::is_map<std::decay_t<out_t>>) {
-        if (!in.is_object()) {
+    else if constexpr (_utils::is_fixed_array<std::decay_t<out_t>>) {
+        if (!in.is_array()) {
             return false;
         }
-        for (auto&& [key, j_elem] : in.as_object()) {
+        auto&& in_as_arr = in.as_array();
+        constexpr size_t out_size = _utils::fixed_array_size<out_t>;
+        if (in_as_arr.size() != out_size) {
+            return false;
+        }
+
+        for (size_t i = 0; i < out_size; ++i) {
+            auto&& j_elem = in_as_arr.at(i);
             using elem_t = typename out_t::value_type;
             elem_t elem {};
             if (!deserialize<elem_t, deserializer_t, string_t>(j_elem, elem, deserializer)) {
                 return false;
             }
-            out.emplace(std::move(elem));
+            out.at(i) = std::move(elem);
         }
         return true;
     }
+    else if constexpr (_utils::is_map<std::decay_t<out_t>>) {
+        if (!in.is_object()) {
+            return false;
+        }
+        for (auto&& [key, j_elem] : in.as_object()) {
+            using elem_t = typename out_t::mapped_type;
+            elem_t elem {};
+            if (!deserialize<elem_t, deserializer_t, string_t>(j_elem, elem, deserializer)) {
+                return false;
+            }
+            out.emplace(std::forward<decltype(key)>(key), std::move(elem));
+        }
+        return true;
+    }
+    else if constexpr (std::is_constructible_v<out_t, basic_value<string_t>>) {
+        out = out_t(in);
+        return true;
+    }
     else {
         _serialization_helper::unable_to_deserialize<out_t>();
     }

3rdparty/include/meojson/common/types.hpp

@@ -1,5 +1,7 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include "array.hpp"
 #include "object.hpp"
-#include "value.hpp"
+#include "value.hpp"

3rdparty/include/meojson/common/utils.hpp

@@ -1,7 +1,14 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
+#include <iomanip>
+#include <limits>
+#include <sstream>
 #include <string>
 #include <type_traits>
+#include <utility>
+#include <variant>
 
 namespace json
 {
@@ -25,7 +32,7 @@ using wobject = basic_object<std::wstring>;
 
 namespace json::ext
 {
-template <typename T>
+template <typename string_t, typename T, typename = void>
 class jsonization
 {
 public:
@@ -61,18 +68,52 @@ constexpr bool is_container<T, std::void_t<typename T::value_type, range_value_t
 template <typename T, typename = void>
 constexpr bool is_map = false;
 template <typename T>
-constexpr bool is_map<T, std::void_t<typename T::key_type, typename T::mapped_type>> = is_container<T>;
+constexpr bool is_map<T, std::void_t<typename T::key_type, typename T::mapped_type>> =
+    is_container<T>;
+
+template <typename T, typename = void>
+constexpr bool is_fixed_array = false;
+template <template <typename, size_t> typename arr_t, typename value_t, size_t size>
+constexpr bool is_fixed_array<arr_t<value_t, size>> = true;
+
+template <typename T, typename = std::enable_if_t<is_fixed_array<T>>>
+constexpr size_t fixed_array_size = 0;
+template <template <typename, size_t> typename arr_t, typename value_t, size_t size>
+constexpr size_t fixed_array_size<arr_t<value_t, size>> = size;
 
 template <typename T, typename = void>
 constexpr bool is_collection = false;
 template <typename T>
-constexpr bool is_collection<T> = is_container<T> && !is_map<T>;
+constexpr bool is_collection<T> = is_container<T> && !is_map<T> && !is_fixed_array<T>;
 
 template <typename T>
-class has_to_json_in_member
+constexpr bool is_variant = false;
+template <typename... args_t>
+constexpr bool is_variant<std::variant<args_t...>> = true;
+
+template <typename T>
+constexpr bool is_tuple = false;
+template <typename... args_t>
+constexpr bool is_tuple<std::tuple<args_t...>> = true;
+
+template <typename T>
+constexpr bool is_pair = false;
+template <typename... args_t>
+constexpr bool is_pair<std::pair<args_t...>> = true;
+
+template <typename T, typename = void>
+constexpr bool is_tuple_like = false;
+template <template <typename...> typename tuple_t, typename... args_t>
+constexpr bool is_tuple_like<
+    tuple_t<args_t...>,
+    std::void_t<decltype(std::tuple_size<tuple_t<args_t...>>::value)>> =
+    std::tuple_size<tuple_t<args_t...>>::value == sizeof...(args_t);
+
+template <typename T>
+class has_emplace_back
 {
     template <typename U>
-    static auto test(int) -> decltype(std::declval<U>().to_json(), std::true_type());
+    static auto test(int) -> decltype(std::declval<U>().emplace_back(), std::true_type());
 
     template <typename U>
     static std::false_type test(...);
@@ -82,10 +123,10 @@ public:
 };
 
 template <typename T>
-class has_to_json_in_templ_spec
+class has_to_json_in_member
 {
     template <typename U>
-    static auto test(int) -> decltype(std::declval<ext::jsonization<U>>().to_json(std::declval<U>()), std::true_type());
+    static auto test(int) -> decltype(std::declval<U>().to_json(), std::true_type());
 
     template <typename U>
     static std::false_type test(...);
@@ -108,21 +149,6 @@ public:
     static constexpr bool value = decltype(test<T>(0))::value;
 };
 
-template <typename T, typename string_t>
-class has_check_json_in_templ_spec
-{
-    template <typename U>
-    static auto test(int)
-        -> decltype(std::declval<ext::jsonization<U>>().check_json(std::declval<json::basic_value<string_t>>()),
-                    std::true_type());
-
-    template <typename U>
-    static std::false_type test(...);
-
-public:
-    static constexpr bool value = decltype(test<T>(0))::value;
-};
-
 template <typename T, typename string_t>
 class has_from_json_in_member
 {
@@ -137,14 +163,208 @@ public:
     static constexpr bool value = decltype(test<T>(0))::value;
 };
 
+template <typename T, typename string_t>
+class has_to_json_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().to_json(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_check_json_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().check_json(std::declval<json::basic_value<string_t>>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
 template <typename T, typename string_t>
 class has_from_json_in_templ_spec
 {
     template <typename U>
     static auto test(int)
-        -> decltype(std::declval<ext::jsonization<U>>().from_json(std::declval<json::basic_value<string_t>>(),
-                                                                  std::declval<U&>()),
-                    std::true_type());
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().from_json(std::declval<json::basic_value<string_t>>(), std::declval<U&>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_to_json_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_from_json_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json(std::declval<json::basic_value<string_t>>(), std::declval<U&>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_to_json_array_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().to_json_array(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_check_json_array_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().check_json_array(std::declval<json::basic_array<string_t>>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_from_json_array_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().from_json_array(std::declval<json::basic_array<string_t>>(), std::declval<U&>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_to_json_array_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json_array(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_from_json_array_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json_array(std::declval<json::basic_array<string_t>>(), std::declval<U&>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_to_json_object_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().to_json_object(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_check_json_object_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().check_json_object(std::declval<json::basic_object<string_t>>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_from_json_object_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().from_json_object(std::declval<json::basic_object<string_t>>(), std::declval<U&>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_to_json_object_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json_object(std::declval<U>()), std::true_type());
+
+    template <typename U>
+    static std::false_type test(...);
+
+public:
+    static constexpr bool value = decltype(test<T>(0))::value;
+};
+
+template <typename T, typename string_t>
+class has_move_from_json_object_in_templ_spec
+{
+    template <typename U>
+    static auto test(int)
+        -> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json_object(std::declval<json::basic_object<string_t>>(), std::declval<U&>()), std::true_type());
 
     template <typename U>
     static std::false_type test(...);
@@ -154,7 +374,7 @@ public:
 };
 
 template <typename string_t>
-static constexpr string_t unescape_string(const string_t& str)
+inline constexpr string_t unescape_string(const string_t& str)
 {
     using char_t = typename string_t::value_type;
 
@@ -202,26 +422,41 @@ static constexpr string_t unescape_string(const string_t& str)
 }
 
 template <typename string_t>
-static constexpr string_t true_string()
+inline constexpr string_t true_string()
 {
     return { 't', 'r', 'u', 'e' };
 }
 
 template <typename string_t>
-static constexpr string_t false_string()
+inline constexpr string_t false_string()
 {
     return { 'f', 'a', 'l', 's', 'e' };
 }
 
 template <typename string_t>
-static constexpr string_t null_string()
+inline constexpr string_t null_string()
 {
     return { 'n', 'u', 'l', 'l' };
 }
 
 template <typename string_t, typename any_t>
-string_t to_basic_string(any_t&& arg)
+inline string_t to_basic_string(any_t&& arg)
 {
+#ifdef MEOJSON_KEEP_FLOATING_PRECISION
+    using real_type = std::remove_reference_t<any_t>;
+    if constexpr (std::is_floating_point_v<real_type>) {
+        if constexpr (std::is_same_v<string_t, std::string>) {
+            std::ostringstream oss;
+            oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
+            return oss.str();
+        }
+        else if constexpr (std::is_same_v<string_t, std::wstring>) {
+            std::wostringstream oss;
+            oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
+            return oss.str();
+        }
+    }
+#endif
     if constexpr (std::is_same_v<string_t, std::string>) {
         return std::to_string(std::forward<any_t>(arg));
     }
@@ -232,4 +467,7 @@ string_t to_basic_string(any_t&& arg)
         static_assert(!sizeof(any_t), "Unsupported type");
     }
 }
+
 } // namespace json::_utils
+
+#include "../reflection/extensions.hpp"

3rdparty/include/meojson/common/value.hpp

@@ -1,13 +1,19 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <cstddef>
 #include <initializer_list>
+#include <map>
 #include <memory>
 #include <optional>
 #include <ostream>
 #include <string>
 #include <tuple>
+#include <type_traits>
+#include <utility>
 #include <variant>
+#include <vector>
 
 #include "exception.hpp"
 #include "utils.hpp"
@@ -64,31 +70,31 @@ public:
     template <typename... args_t>
     basic_value(value_type type, args_t&&... args);
 
-    template <typename collection_t,
-              std::enable_if_t<_utils::is_collection<collection_t> &&
-                                   std::is_constructible_v<typename basic_array<string_t>::value_type,
-                                                           _utils::range_value_t<collection_t>>,
-                               bool> = true>
-    basic_value(collection_t&& collection) : basic_value(basic_array<string_t>(std::forward<collection_t>(collection)))
-    {}
-    template <typename map_t, std::enable_if_t<_utils::is_map<map_t> &&
-                                                   std::is_constructible_v<typename basic_object<string_t>::value_type,
-                                                                           _utils::range_value_t<map_t>>,
-                                               bool> = true>
-    basic_value(map_t&& map) : basic_value(basic_object<string_t>(std::forward<map_t>(map)))
-    {}
+    template <typename enum_t, std::enable_if_t<std::is_enum_v<enum_t>, bool> = true>
+    basic_value(enum_t e)
+        : basic_value(static_cast<std::underlying_type_t<enum_t>>(e))
+    {
+    }
 
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_member<jsonization_t>::value, bool> = true>
-    basic_value(const jsonization_t& value) : basic_value(value.to_json())
-    {}
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t>::value, bool> = true>
-    basic_value(const jsonization_t& value) : basic_value(ext::jsonization<jsonization_t>().to_json(value))
-    {}
+    template <
+        typename jsonization_t,
+        std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t, string_t>::value, bool> =
+            true>
+    basic_value(const jsonization_t& value)
+        : basic_value(ext::jsonization<string_t, jsonization_t>().to_json(value))
+    {
+    }
 
-    template <typename value_t, std::enable_if_t<!std::is_convertible_v<value_t, basic_value<string_t>>, bool> = true>
-    basic_value(value_t) = delete;
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            std::is_rvalue_reference_v<jsonization_t&&>
+                && _utils::has_move_to_json_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    basic_value(jsonization_t&& value)
+        : basic_value(ext::jsonization<string_t, jsonization_t>().move_to_json(std::move(value)))
+    {
+    }
 
     // I don't know if you want to convert char to string or number, so I delete these constructors.
     basic_value(char) = delete;
@@ -99,13 +105,21 @@ public:
     ~basic_value();
 
     bool valid() const noexcept { return _type != value_type::invalid; }
+
     bool empty() const noexcept { return is_null(); }
+
     bool is_null() const noexcept { return _type == value_type::null; }
+
     bool is_number() const noexcept { return _type == value_type::number; }
+
     bool is_boolean() const noexcept { return _type == value_type::boolean; }
+
     bool is_string() const noexcept { return _type == value_type::string; }
+
     bool is_array() const noexcept { return _type == value_type::array; }
+
     bool is_object() const noexcept { return _type == value_type::object; }
+
     template <typename value_t>
     bool is() const noexcept;
 
@@ -114,9 +128,13 @@ public:
 
     bool contains(const string_t& key) const;
     bool contains(size_t pos) const;
+
     bool exists(const string_t& key) const { return contains(key); }
+
     bool exists(size_t pos) const { return contains(pos); }
+
     value_type type() const noexcept { return _type; }
+
     const basic_value<string_t>& at(size_t pos) const;
     const basic_value<string_t>& at(const string_t& key) const;
 
@@ -148,11 +166,19 @@ public:
 
     template <typename value_t, template <typename...> typename collection_t = std::vector>
     collection_t<value_t> as_collection() const;
+    template <
+        typename value_t,
+        size_t Size,
+        template <typename, size_t> typename fixed_array_t = std::array>
+    fixed_array_t<value_t, Size> as_fixed_array() const;
     template <typename value_t, template <typename...> typename map_t = std::map>
     map_t<string_t, value_t> as_map() const;
 
     template <typename value_t>
-    value_t as() const;
+    value_t as() const&;
+
+    template <typename value_t>
+    value_t as() &&;
 
     basic_array<string_t>& as_array();
     basic_object<string_t>& as_object();
@@ -162,20 +188,29 @@ public:
 
     void clear() noexcept;
 
-    string_t dumps(std::optional<size_t> indent = std::nullopt) const { return indent ? format(*indent) : to_string(); }
+    string_t dumps(std::optional<size_t> indent = std::nullopt) const
+    {
+        return indent ? format(*indent) : to_string();
+    }
+
     // return raw string
     string_t to_string() const;
+
     string_t format(size_t indent = 4) const { return format(indent, 0); }
 
     basic_value<string_t>& operator=(const basic_value<string_t>& rhs);
     basic_value<string_t>& operator=(basic_value<string_t>&&) noexcept;
-    template <typename value_t, std::enable_if_t<std::is_convertible_v<value_t, basic_value<string_t>>, bool> = true>
-    basic_value<string_t>& operator=(value_t rhs)
-    {
-        return *this = basic_value<string_t>(std::move(rhs));
-    }
+
+    // template <
+    //     typename value_t,
+    //     std::enable_if_t<std::is_convertible_v<value_t, basic_value<string_t>>, bool> = true>
+    // basic_value<string_t>& operator=(value_t rhs)
+    // {
+    //     return *this = basic_value<string_t>(std::move(rhs));
+    // }
 
     bool operator==(const basic_value<string_t>& rhs) const;
+
     bool operator!=(const basic_value<string_t>& rhs) const { return !(*this == rhs); }
 
     const basic_value<string_t>& operator[](size_t pos) const;
@@ -200,48 +235,78 @@ public:
     basic_value<string_t>& operator+=(basic_array<string_t>&& rhs);
 
     explicit operator bool() const { return as_boolean(); }
+
     explicit operator int() const { return as_integer(); }
+
     explicit operator unsigned() const { return as_unsigned(); }
+
     explicit operator long() const { return as_long(); }
+
     explicit operator unsigned long() const { return as_unsigned_long(); }
+
     explicit operator long long() const { return as_long_long(); }
+
     explicit operator unsigned long long() const { return as_unsigned_long_long(); }
+
     explicit operator float() const { return as_float(); }
+
     explicit operator double() const { return as_double(); }
+
     explicit operator long double() const { return as_long_double(); }
+
     explicit operator string_t() const { return as_string(); }
 
     explicit operator basic_array<string_t>() const { return as_array(); }
+
     explicit operator basic_object<string_t>() const { return as_object(); }
 
-    template <typename value_t, template <typename...> typename collection_t = std::vector,
-              std::enable_if_t<_utils::is_collection<collection_t<value_t>>, bool> = true>
+    template <
+        typename value_t,
+        template <typename...> typename collection_t = std::vector,
+        std::enable_if_t<_utils::is_collection<collection_t<value_t>>, bool> = true>
     explicit operator collection_t<value_t>() const
     {
         return as_collection<value_t, collection_t>();
     }
-    template <typename value_t, template <typename...> typename map_t = std::map,
-              std::enable_if_t<_utils::is_map<map_t<string_t, value_t>>, bool> = true>
+
+    template <
+        typename value_t,
+        template <typename...> typename map_t = std::map,
+        std::enable_if_t<_utils::is_map<map_t<string_t, value_t>>, bool> = true>
     explicit operator map_t<string_t, value_t>() const
     {
         return as_map<value_t, map_t>();
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_member<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <typename enum_t, std::enable_if_t<std::is_enum_v<enum_t>, bool> = true>
+    explicit operator enum_t() const
+    {
+        return static_cast<enum_t>(static_cast<std::underlying_type_t<enum_t>>(*this));
+    }
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() const&
     {
         jsonization_t dst {};
-        if (!dst.from_json(*this)) {
+        if (!ext::jsonization<string_t, jsonization_t>().from_json(*this, dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
     }
-    template <typename jsonization_t,
-              std::enable_if_t<_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value, bool> = true>
-    explicit operator jsonization_t() const
+
+    template <
+        typename jsonization_t,
+        std::enable_if_t<
+            _utils::has_move_from_json_in_templ_spec<jsonization_t, string_t>::value,
+            bool> = true>
+    explicit operator jsonization_t() &&
     {
         jsonization_t dst {};
-        if (!ext::jsonization<jsonization_t>().from_json(*this, dst)) {
+        if (!ext::jsonization<string_t, jsonization_t>().move_from_json(std::move(*this), dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
@@ -256,8 +321,9 @@ private:
     static var_t deep_copy(const var_t& src);
 
     template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-    auto get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-             std::index_sequence<keys_indexes_t...>) const;
+    auto
+        get(std::tuple<key_then_default_value_t...> keys_then_default_value,
+            std::index_sequence<keys_indexes_t...>) const;
 
     template <typename value_t, typename first_key_t, typename... rest_keys_t>
     auto get_helper(const value_t& default_value, first_key_t&& first, rest_keys_t&&... rest) const;
@@ -276,89 +342,125 @@ inline basic_value<string_t>::basic_value() = default;
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(const basic_value<string_t>& rhs)
-    : _type(rhs._type), _raw_data(deep_copy(rhs._raw_data))
-{}
+    : _type(rhs._type)
+    , _raw_data(deep_copy(rhs._raw_data))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(basic_value<string_t>&& rhs) noexcept = default;
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(bool b)
-    : _type(value_type::boolean),
-      _raw_data(string_t(b ? _utils::true_string<string_t>() : _utils::false_string<string_t>()))
-{}
+    : _type(value_type::boolean)
+    , _raw_data(string_t(b ? _utils::true_string<string_t>() : _utils::false_string<string_t>()))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(int num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(unsigned num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(long num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(unsigned long num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(long long num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(unsigned long long num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(float num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(double num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(long double num)
-    : _type(value_type::number), _raw_data(_utils::to_basic_string<string_t>(num))
-{}
+    : _type(value_type::number)
+    , _raw_data(_utils::to_basic_string<string_t>(num))
+{
+}
 
 template <typename string_t>
-inline basic_value<string_t>::basic_value(const char_t* str) : _type(value_type::string), _raw_data(string_t(str))
-{}
+inline basic_value<string_t>::basic_value(const char_t* str)
+    : _type(value_type::string)
+    , _raw_data(string_t(str))
+{
+}
 
 template <typename string_t>
-inline basic_value<string_t>::basic_value(string_t str) : _type(value_type::string), _raw_data(std::move(str))
-{}
+inline basic_value<string_t>::basic_value(string_t str)
+    : _type(value_type::string)
+    , _raw_data(std::move(str))
+{
+}
 
 template <typename string_t>
-inline basic_value<string_t>::basic_value(std::nullptr_t) : _type(value_type::null)
-{}
+inline basic_value<string_t>::basic_value(std::nullptr_t)
+    : _type(value_type::null)
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(basic_array<string_t> arr)
-    : _type(value_type::array), _raw_data(std::make_unique<basic_array<string_t>>(std::move(arr)))
-{}
+    : _type(value_type::array)
+    , _raw_data(std::make_unique<basic_array<string_t>>(std::move(arr)))
+{
+}
 
 template <typename string_t>
 inline basic_value<string_t>::basic_value(basic_object<string_t> obj)
-    : _type(value_type::object), _raw_data(std::make_unique<basic_object<string_t>>(std::move(obj)))
-{}
+    : _type(value_type::object)
+    , _raw_data(std::make_unique<basic_object<string_t>>(std::move(obj)))
+{
+}
 
 template <typename string_t>
-inline basic_value<string_t>::basic_value(std::initializer_list<typename basic_object<string_t>::value_type> init_list)
-    : _type(value_type::object), _raw_data(std::make_unique<basic_object<string_t>>(init_list))
-{}
+inline basic_value<string_t>::basic_value(
+    std::initializer_list<typename basic_object<string_t>::value_type> init_list)
+    : _type(value_type::object)
+    , _raw_data(std::make_unique<basic_object<string_t>>(init_list))
+{
+}
 
 // for Pimpl
 template <typename string_t>
@@ -371,16 +473,13 @@ inline bool basic_value<string_t>::is() const noexcept
     if constexpr (std::is_same_v<basic_value<string_t>, value_t>) {
         return true;
     }
-    else if constexpr (_utils::has_check_json_in_member<value_t, string_t>::value) {
-        return value_t().check_json(*this);
-    }
     else if constexpr (_utils::has_check_json_in_templ_spec<value_t, string_t>::value) {
-        return ext::jsonization<value_t>().check_json(*this);
+        return ext::jsonization<string_t, value_t>().check_json(*this);
     }
     else if constexpr (std::is_same_v<bool, value_t>) {
         return is_boolean();
     }
-    else if constexpr (std::is_arithmetic_v<value_t>) {
+    else if constexpr (std::is_arithmetic_v<value_t> || std::is_enum_v<value_t>) {
         return is_number();
     }
     else if constexpr (std::is_constructible_v<string_t, value_t>) {
@@ -396,8 +495,8 @@ inline bool basic_value<string_t>::is() const noexcept
         return is_object();
     }
     else if constexpr (_utils::is_map<value_t>) {
-        return is_object() && std::is_constructible_v<string_t, typename value_t::key_type> &&
-               all<typename value_t::mapped_type>();
+        return is_object() && std::is_constructible_v<string_t, typename value_t::key_type>
+               && all<typename value_t::mapped_type>();
     }
     else {
         static_assert(!sizeof(value_t), "Unsupported type");
@@ -444,33 +543,42 @@ template <typename string_t>
 template <typename... key_then_default_value_t>
 inline auto basic_value<string_t>::get(key_then_default_value_t&&... keys_then_default_value) const
 {
-    return get(std::forward_as_tuple(keys_then_default_value...),
-               std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
+    return get(
+        std::forward_as_tuple(keys_then_default_value...),
+        std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
 }
 
 template <typename string_t>
 template <typename... key_then_default_value_t, size_t... keys_indexes_t>
-inline auto basic_value<string_t>::get(std::tuple<key_then_default_value_t...> keys_then_default_value,
-                                       std::index_sequence<keys_indexes_t...>) const
+inline auto basic_value<string_t>::get(
+    std::tuple<key_then_default_value_t...> keys_then_default_value,
+    std::index_sequence<keys_indexes_t...>) const
 {
     constexpr unsigned long default_value_index = sizeof...(key_then_default_value_t) - 1;
-    return get_helper(std::get<default_value_index>(keys_then_default_value),
-                      std::get<keys_indexes_t>(keys_then_default_value)...);
+    return get_helper(
+        std::get<default_value_index>(keys_then_default_value),
+        std::get<keys_indexes_t>(keys_then_default_value)...);
 }
 
 template <typename string_t>
 template <typename value_t, typename first_key_t, typename... rest_keys_t>
-inline auto basic_value<string_t>::get_helper(const value_t& default_value, first_key_t&& first,
-                                              rest_keys_t&&... rest) const
+inline auto basic_value<string_t>::get_helper(
+    const value_t& default_value,
+    first_key_t&& first,
+    rest_keys_t&&... rest) const
 {
     if constexpr (std::is_constructible_v<string_t, first_key_t>) {
-        return is_object() ? as_object().get_helper(default_value, std::forward<first_key_t>(first),
-                                                    std::forward<rest_keys_t>(rest)...)
+        return is_object() ? as_object().get_helper(
+                                 default_value,
+                                 std::forward<first_key_t>(first),
+                                 std::forward<rest_keys_t>(rest)...)
                            : default_value;
     }
     else if constexpr (std::is_integral_v<std::decay_t<first_key_t>>) {
-        return is_array() ? as_array().get_helper(default_value, std::forward<first_key_t>(first),
-                                                  std::forward<rest_keys_t>(rest)...)
+        return is_array() ? as_array().get_helper(
+                                default_value,
+                                std::forward<first_key_t>(first),
+                                std::forward<rest_keys_t>(rest)...)
                           : default_value;
     }
     else {
@@ -480,16 +588,22 @@ inline auto basic_value<string_t>::get_helper(const value_t& default_value, firs
 
 template <typename string_t>
 template <typename value_t, typename unique_key_t>
-inline auto basic_value<string_t>::get_helper(const value_t& default_value, unique_key_t&& first) const
+inline auto
+    basic_value<string_t>::get_helper(const value_t& default_value, unique_key_t&& first) const
 {
     if constexpr (std::is_constructible_v<string_t, unique_key_t>) {
-        return is_object() ? as_object().get_helper(default_value, std::forward<unique_key_t>(first)) : default_value;
+        return is_object()
+                   ? as_object().get_helper(default_value, std::forward<unique_key_t>(first))
+                   : default_value;
     }
     else if constexpr (std::is_integral_v<std::decay_t<unique_key_t>>) {
-        return is_array() ? as_array().get_helper(default_value, std::forward<unique_key_t>(first)) : default_value;
+        return is_array() ? as_array().get_helper(default_value, std::forward<unique_key_t>(first))
+                          : default_value;
     }
     else {
-        static_assert(!sizeof(unique_key_t), "Parameter must be integral or string_t constructible");
+        static_assert(
+            !sizeof(unique_key_t),
+            "Parameter must be integral or string_t constructible");
     }
 }
 
@@ -682,21 +796,33 @@ inline basic_object<string_t>& basic_value<string_t>::as_object()
 
 template <typename string_t>
 template <typename value_t>
-inline value_t basic_value<string_t>::as() const
+inline value_t basic_value<string_t>::as() const&
 {
     if constexpr (std::is_same_v<basic_value<string_t>, value_t>) {
         return *this;
     }
-    else if constexpr (_utils::has_from_json_in_member<value_t, string_t>::value) {
+    else if constexpr (_utils::has_from_json_in_templ_spec<value_t, string_t>::value) {
         value_t dst {};
-        if (!dst.from_json(*this)) {
+        if (!ext::jsonization<string_t, value_t>().from_json(*this, dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
     }
-    else if constexpr (_utils::has_from_json_in_templ_spec<value_t, string_t>::value) {
+    else {
+        return static_cast<value_t>(*this);
+    }
+}
+
+template <typename string_t>
+template <typename value_t>
+inline value_t basic_value<string_t>::as() &&
+{
+    if constexpr (std::is_same_v<basic_value<string_t>, value_t>) {
+        return std::move(*this);
+    }
+    else if constexpr (_utils::has_move_from_json_in_templ_spec<value_t, string_t>::value) {
         value_t dst {};
-        if (!ext::jsonization<value_t>().from_json(*this, dst)) {
+        if (!ext::jsonization<string_t, value_t>().move_from_json(std::move(*this), dst)) {
             throw exception("Wrong JSON");
         }
         return dst;
@@ -722,10 +848,14 @@ template <typename string_t>
 template <typename... args_t>
 inline decltype(auto) basic_value<string_t>::emplace(args_t&&... args)
 {
-    constexpr bool is_array_args = std::is_constructible_v<typename basic_array<string_t>::value_type, args_t...>;
-    constexpr bool is_object_args = std::is_constructible_v<typename basic_object<string_t>::value_type, args_t...>;
+    constexpr bool is_array_args =
+        std::is_constructible_v<typename basic_array<string_t>::value_type, args_t...>;
+    constexpr bool is_object_args =
+        std::is_constructible_v<typename basic_object<string_t>::value_type, args_t...>;
 
-    static_assert(is_array_args || is_object_args, "Args can not constructure a array or object value");
+    static_assert(
+        is_array_args || is_object_args,
+        "Args can not constructure a array or object value");
 
     if constexpr (is_array_args) {
         return as_array().emplace_back(std::forward<args_t>(args)...);
@@ -801,6 +931,13 @@ inline collection_t<value_t> basic_value<string_t>::as_collection() const
     return as_array().template as_collection<value_t, collection_t>();
 }
 
+template <typename string_t>
+template <typename value_t, size_t Size, template <typename, size_t> typename fixed_array_t>
+inline fixed_array_t<value_t, Size> basic_value<string_t>::as_fixed_array() const
+{
+    return as_array().template as_fixed_array<value_t, Size>();
+}
+
 template <typename string_t>
 template <typename value_t, template <typename...> typename map_t>
 inline map_t<string_t, value_t> basic_value<string_t>::as_map() const
@@ -818,12 +955,15 @@ inline basic_value<string_t>& basic_value<string_t>::operator=(const basic_value
 }
 
 template <typename string_t>
-inline basic_value<string_t>& basic_value<string_t>::operator=(basic_value<string_t>&& rhs) noexcept = default;
+inline basic_value<string_t>&
+    basic_value<string_t>::operator=(basic_value<string_t>&& rhs) noexcept = default;
 
 template <typename string_t>
 inline bool basic_value<string_t>::operator==(const basic_value<string_t>& rhs) const
 {
-    if (_type != rhs._type) return false;
+    if (_type != rhs._type) {
+        return false;
+    }
 
     switch (_type) {
     case value_type::null:
@@ -878,7 +1018,8 @@ inline basic_value<string_t>& basic_value<string_t>::operator[](string_t&& key)
 }
 
 template <typename string_t>
-inline basic_value<string_t> basic_value<string_t>::operator|(const basic_object<string_t>& rhs) const&
+inline basic_value<string_t>
+    basic_value<string_t>::operator|(const basic_object<string_t>& rhs) const&
 {
     return as_object() | rhs;
 }
@@ -916,7 +1057,8 @@ inline basic_value<string_t>& basic_value<string_t>::operator|=(basic_object<str
 }
 
 template <typename string_t>
-inline basic_value<string_t> basic_value<string_t>::operator+(const basic_array<string_t>& rhs) const&
+inline basic_value<string_t>
+    basic_value<string_t>::operator+(const basic_array<string_t>& rhs) const&
 {
     return as_array() + rhs;
 }
@@ -956,9 +1098,12 @@ inline basic_value<string_t>& basic_value<string_t>::operator+=(basic_array<stri
 template <typename string_t>
 template <typename... args_t>
 inline basic_value<string_t>::basic_value(value_type type, args_t&&... args)
-    : _type(type), _raw_data(std::forward<args_t>(args)...)
+    : _type(type)
+    , _raw_data(std::forward<args_t>(args)...)
 {
-    static_assert(std::is_constructible_v<var_t, args_t...>, "Parameter can't be used to construct a var_t");
+    static_assert(
+        std::is_constructible_v<var_t, args_t...>,
+        "Parameter can't be used to construct a var_t");
 }
 
 template <typename string_t>
@@ -981,11 +1126,14 @@ inline typename basic_value<string_t>::var_t basic_value<string_t>::deep_copy(co
     return dst;
 }
 
-template <typename ostream_t, typename string_t,
-          typename std_ostream_t =
-              std::basic_ostream<typename string_t::value_type, std::char_traits<typename string_t::value_type>>,
-          typename =
-              std::enable_if_t<std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
+template <
+    typename ostream_t,
+    typename string_t,
+    typename std_ostream_t = std::basic_ostream<
+        typename string_t::value_type,
+        std::char_traits<typename string_t::value_type>>,
+    typename = std::enable_if_t<
+        std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
 ostream_t& operator<<(ostream_t& out, const basic_value<string_t>& val)
 {
     out << val.format();

3rdparty/include/meojson/json.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "common/serialization.hpp"
+// IWYU pragma: begin_exports
+
 #include "common/types.hpp"
 #include "parser/parser.hpp"
 #include "reflection/jsonization.hpp"
+
+// IWYU pragma: end_exports

3rdparty/include/meojson/json5.hpp

@@ -1,4 +0,0 @@
-#pragma once
-
-#include "common/types.hpp"
-#include "parser5/parser5.hpp"

3rdparty/include/meojson/parser/bitops.hpp

@@ -1,13 +1,17 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #if __cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
 #include <bit>
+
 namespace json::_bitops
 {
 using std::countl_one;
 using std::countl_zero;
 using std::countr_one;
 using std::countr_zero;
+
 inline constexpr bool is_little_endian()
 {
     return std::endian::native == std::endian::little;
@@ -15,25 +19,37 @@ inline constexpr bool is_little_endian()
 }
 #else
 #include <cstdint>
+
 namespace json::_bitops
 {
 #if defined(__GNUC__) || defined(__clang__)
 inline constexpr int countl_zero(uint32_t x)
 {
-    if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) return x == 0 ? 32 : __builtin_clz(x);
-    if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) return x == 0 ? 32 : __builtin_clzl(x);
+    if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) {
+        return x == 0 ? 32 : __builtin_clz(x);
+    }
+    if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) {
+        return x == 0 ? 32 : __builtin_clzl(x);
+    }
     return x == 0 ? 32 : __builtin_clzll(x);
 }
+
 inline constexpr int countr_zero(uint32_t x)
 {
-    if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) return x == 0 ? 32 : __builtin_ctz(x);
-    if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) return x == 0 ? 32 : __builtin_ctzl(x);
+    if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) {
+        return x == 0 ? 32 : __builtin_ctz(x);
+    }
+    if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) {
+        return x == 0 ? 32 : __builtin_ctzl(x);
+    }
     return x == 0 ? 32 : __builtin_ctzll(x);
 }
+
 inline constexpr int countl_zero(uint64_t x)
 {
     return x == 0 ? 64 : __builtin_clzll(x);
 }
+
 inline constexpr int countr_zero(uint64_t x)
 {
     return x == 0 ? 64 : __builtin_ctzll(x);
@@ -45,14 +61,17 @@ inline int countl_zero(uint32_t x)
 {
     return __lzcnt(x);
 }
+
 inline int countr_zero(uint32_t x)
 {
     return _tzcnt_u32(x);
 }
+
 inline int countl_zero(uint64_t x)
 {
     return (int)__lzcnt64(x);
 }
+
 inline int countr_zero(uint64_t x)
 {
     return (int)_tzcnt_u64(x);
@@ -63,16 +82,19 @@ inline constexpr int countl_zero(uint32_t x)
     unsigned long index = 0;
     return _BitScanReverse(&index, x) ? 31 - index : 32;
 }
+
 inline constexpr int countr_zero(uint32_t x)
 {
     unsigned long index = 0;
     return _BitScanForward(&index, x) ? index : 32;
 }
+
 inline constexpr int countl_zero(uint64_t x)
 {
     unsigned long index = 0;
     return _BitScanReverse64(&index, x) ? 63 - index : 64;
 }
+
 inline constexpr int countr_zero(uint64_t x)
 {
     unsigned long index = 0;
@@ -86,14 +108,17 @@ inline int countl_one(uint32_t x)
 {
     return countl_zero(~x);
 }
+
 inline int countr_one(uint32_t x)
 {
     return countr_zero(~x);
 }
+
 inline int countl_one(uint64_t x)
 {
     return countl_zero(~x);
 }
+
 inline int countr_one(uint64_t x)
 {
     return countr_zero(~x);
@@ -102,10 +127,12 @@ inline int countr_one(uint64_t x)
 // no constexpr endian awareness before C++20
 inline bool is_little_endian()
 {
-    union {
+    union
+    {
         uint32_t u32;
         uint8_t u8;
     } u = { 0x01020304 };
+
     return u.u8 == 4;
 }
 } // namespace json::_bitops

3rdparty/include/meojson/parser/packed_bytes.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <cstdint>
@@ -28,11 +30,13 @@ struct packed_bytes
 };
 }
 
+#ifndef MEOJSON_DISABLE_PACKED_BYTES
 #if defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP)
 #include "packed_bytes_x86.hpp"
 #elif defined(__ARM_NEON) || defined(_M_ARM) || defined(_M_ARM64)
 #include "packed_bytes_arm.hpp"
 #endif
+#endif
 
 namespace json::_packed_bytes
 {
@@ -66,14 +70,19 @@ struct packed_bytes_trait_uint64
         return is_zero_memberwise((x) ^ (UINT64_C(0x0101010101010101) * (n)));
     }
 
-    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return a | b; }
+    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
+    {
+        return a | b;
+    }
 
     __packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
     {
-        if (_bitops::is_little_endian())
+        if (_bitops::is_little_endian()) {
             return _bitops::countr_zero(x) / 8;
-        else
+        }
+        else {
             return _bitops::countl_zero(x) / 8;
+        }
     }
 };
 
@@ -108,16 +117,22 @@ struct packed_bytes_trait_uint32
         return is_zero_memberwise((x) ^ (~UINT32_C(0) / 255 * (n)));
     }
 
-    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return a | b; }
+    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
+    {
+        return a | b;
+    }
 
     __packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
     {
-        if (_bitops::is_little_endian())
+        if (_bitops::is_little_endian()) {
             return _bitops::countr_zero(x) / 8;
-        else
+        }
+        else {
             return _bitops::countl_zero(x) / 8;
+        }
     }
 };
+
 template <>
 struct packed_bytes<8>
 {
@@ -133,9 +148,14 @@ struct packed_bytes<4>
 template <size_t N>
 using packed_bytes_trait = typename packed_bytes<N>::traits;
 
-using packed_bytes_trait_max =
-    std::conditional_t<packed_bytes_trait<32>::available, packed_bytes_trait<32>,
-                       std::conditional_t<packed_bytes_trait<16>::available, packed_bytes_trait<16>,
-                                          std::conditional_t<packed_bytes_trait<8>::available, packed_bytes_trait<8>,
-                                                             packed_bytes_trait<4>>>>;
+using packed_bytes_trait_max = std::conditional_t<
+    packed_bytes_trait<32>::available,
+    packed_bytes_trait<32>,
+    std::conditional_t<
+        packed_bytes_trait<16>::available,
+        packed_bytes_trait<16>,
+        std::conditional_t<
+            packed_bytes_trait<8>::available,
+            packed_bytes_trait<8>,
+            packed_bytes_trait<4>>>>;
 } // namespace json::_packed_bytes

3rdparty/include/meojson/parser/packed_bytes_arm.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 // current NEON implementation doesn't outperform 64-bit scalar implementation
@@ -17,7 +19,10 @@ struct packed_bytes_trait_neon
     static constexpr auto step = 16;
     using value_type = uint8x16_t;
 
-    __packed_bytes_strong_inline static value_type load_unaligned(const void* ptr) { return vld1q_u8((uint8_t*)ptr); }
+    __packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
+    {
+        return vld1q_u8((uint8_t*)ptr);
+    }
 
     __packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
     {
@@ -26,19 +31,31 @@ struct packed_bytes_trait_neon
         return is_less;
     }
 
-    __packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n) { return vceqq_u8(x, vdupq_n_u8(n)); }
+    __packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
+    {
+        return vceqq_u8(x, vdupq_n_u8(n));
+    }
 
-    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return vceqq_u8(x, y); }
+    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
+    {
+        return vceqq_u8(x, y);
+    }
 
-    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return vorrq_u8(a, b); }
+    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
+    {
+        return vorrq_u8(a, b);
+    }
 
     __packed_bytes_strong_inline static bool is_all_zero(value_type x)
     {
 #ifdef __packed_bytes_trait_arm64
         return vmaxvq_u8(x) == 0;
 #else
-        auto fold64 = vorr_u64(vget_high_u64(vreinterpretq_u8_u64(x), 0), vget_low_u64(vreinterpretq_u8_u64(x), 1));
-        auto fold32 = vget_lane_u32(vreinterpret_u64_u32(fold64), 0) | vget_lane_u32(vreinterpret_u64_u32(fold64), 1);
+        auto fold64 = vorr_u64(
+            vget_high_u64(vreinterpretq_u8_u64(x), 0),
+            vget_low_u64(vreinterpretq_u8_u64(x), 1));
+        auto fold32 = vget_lane_u32(vreinterpret_u64_u32(fold64), 0)
+                      | vget_lane_u32(vreinterpret_u64_u32(fold64), 1);
         return fold32 == 0;
 #endif
     }

3rdparty/include/meojson/parser/packed_bytes_x86.hpp

@@ -1,4 +1,7 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
+
 #include "packed_bytes.hpp"
 
 #include <emmintrin.h>
@@ -35,9 +38,15 @@ struct packed_bytes_trait_sse
         return _mm_cmpeq_epi8(x, _mm_set1_epi8(static_cast<char>(n)));
     }
 
-    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return _mm_cmpeq_epi8(x, y); }
+    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
+    {
+        return _mm_cmpeq_epi8(x, y);
+    }
 
-    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return _mm_or_si128(a, b); }
+    __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
+    {
+        return _mm_or_si128(a, b);
+    }
 
     __packed_bytes_strong_inline static bool is_all_zero(value_type x)
     {
@@ -97,14 +106,20 @@ struct packed_bytes_trait_avx2
         return _mm256_cmpeq_epi8(x, _mm256_set1_epi8(static_cast<char>(n)));
     }
 
-    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return _mm256_cmpeq_epi8(x, y); }
+    __packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
+    {
+        return _mm256_cmpeq_epi8(x, y);
+    }
 
     __packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
     {
         return _mm256_or_si256(a, b);
     }
 
-    __packed_bytes_strong_inline static bool is_all_zero(value_type x) { return (bool)_mm256_testz_si256(x, x); }
+    __packed_bytes_strong_inline static bool is_all_zero(value_type x)
+    {
+        return (bool)_mm256_testz_si256(x, x);
+    }
 
     __packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
     {

3rdparty/include/meojson/parser/parser.hpp

@@ -1,5 +1,8 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
+#include <cctype>
 #include <fstream>
 #include <optional>
 #include <ostream>
@@ -15,8 +18,11 @@ namespace json
 // *      parser declare      *
 // ****************************
 
-template <typename string_t = default_string_t, typename parsing_t = void,
-          typename accel_traits = _packed_bytes::packed_bytes_trait_max>
+template <
+    bool accept_jsonc = false,
+    typename string_t = default_string_t,
+    typename parsing_t = void,
+    typename accel_traits = _packed_bytes::packed_bytes_trait_max>
 class parser
 {
 public:
@@ -28,7 +34,12 @@ public:
     static std::optional<basic_value<string_t>> parse(const parsing_t& content);
 
 private:
-    parser(parsing_iter_t cbegin, parsing_iter_t cend) noexcept : _cur(cbegin), _end(cend) { ; }
+    parser(parsing_iter_t cbegin, parsing_iter_t cend) noexcept
+        : _cur(cbegin)
+        , _end(cend)
+    {
+        ;
+    }
 
     std::optional<basic_value<string_t>> parse();
     basic_value<string_t> parse_value();
@@ -46,7 +57,9 @@ private:
 
     bool skip_string_literal_with_accel();
     bool skip_whitespace() noexcept;
+    bool skip_comment() noexcept;
     bool skip_digit();
+    bool skip_unicode_escape(uint16_t& pair_high, string_t& result);
 
 private:
     parsing_iter_t _cur;
@@ -63,26 +76,34 @@ auto parse(const parsing_t& content);
 template <typename char_t>
 auto parse(char_t* content);
 
-template <typename istream_t,
-          typename = std::enable_if_t<std::is_base_of_v<std::basic_istream<typename istream_t::char_type>, istream_t>>>
-auto parse(istream_t& istream, bool check_bom);
+template <typename parsing_t>
+auto parsec(const parsing_t& content);
+
+template <typename char_t>
+auto parsec(char_t* content);
+
+template <
+    typename istream_t,
+    typename = std::enable_if_t<
+        std::is_base_of_v<std::basic_istream<typename istream_t::char_type>, istream_t>>>
+auto parse(istream_t& istream, bool check_bom = false, bool with_commets = false);
 
 template <typename ifstream_t = std::ifstream, typename path_t = void>
-auto open(const path_t& path, bool check_bom = false);
+auto open(const path_t& path, bool check_bom = false, bool with_commets = false);
 
 namespace literals
 {
-    value operator""_json(const char* str, size_t len);
-    wvalue operator""_json(const wchar_t* str, size_t len);
+value operator""_json(const char* str, size_t len);
+wvalue operator""_json(const wchar_t* str, size_t len);
 
-    value operator""_jvalue(const char* str, size_t len);
-    wvalue operator""_jvalue(const wchar_t* str, size_t len);
+value operator""_jvalue(const char* str, size_t len);
+wvalue operator""_jvalue(const wchar_t* str, size_t len);
 
-    array operator""_jarray(const char* str, size_t len);
-    warray operator""_jarray(const wchar_t* str, size_t len);
+array operator""_jarray(const char* str, size_t len);
+warray operator""_jarray(const wchar_t* str, size_t len);
 
-    object operator""_jobject(const char* str, size_t len);
-    wobject operator""_jobject(const wchar_t* str, size_t len);
+object operator""_jobject(const char* str, size_t len);
+wobject operator""_jobject(const wchar_t* str, size_t len);
 }
 
 template <typename string_t = default_string_t>
@@ -92,14 +113,17 @@ const basic_value<string_t> invalid_value();
 // *      parser impl      *
 // *************************
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline std::optional<basic_value<string_t>> parser<string_t, parsing_t, accel_traits>::parse(const parsing_t& content)
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline std::optional<basic_value<string_t>>
+    parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse(const parsing_t& content)
 {
-    return parser<string_t, parsing_t, accel_traits>(content.cbegin(), content.cend()).parse();
+    return parser<accept_jsonc, string_t, parsing_t, accel_traits>(content.cbegin(), content.cend())
+        .parse();
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline std::optional<basic_value<string_t>> parser<string_t, parsing_t, accel_traits>::parse()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline std::optional<basic_value<string_t>>
+    parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse()
 {
     if (!skip_whitespace()) {
         return std::nullopt;
@@ -121,8 +145,7 @@ inline std::optional<basic_value<string_t>> parser<string_t, parsing_t, accel_tr
         return std::nullopt;
     }
 
-    // After the parsing is complete, there should be no more content other than
-    // spaces behind
+    // After the parsing is complete, there should be no more content other than spaces behind
     if (skip_whitespace()) {
         return std::nullopt;
     }
@@ -130,8 +153,8 @@ inline std::optional<basic_value<string_t>> parser<string_t, parsing_t, accel_tr
     return result_value;
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_value()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_value()
 {
     switch (*_cur) {
     case 'n':
@@ -162,8 +185,8 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_va
     }
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_null()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_null()
 {
     for (const auto& ch : _utils::null_string<string_t>()) {
         if (_cur != _end && *_cur == ch) {
@@ -177,8 +200,9 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_nu
     return basic_value<string_t>();
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_boolean()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t>
+    parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_boolean()
 {
     switch (*_cur) {
     case 't':
@@ -206,8 +230,8 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_bo
     }
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_number()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_number()
 {
     const auto first = _cur;
     if (*_cur == '-') {
@@ -245,18 +269,20 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_nu
     return basic_value<string_t>(basic_value<string_t>::value_type::number, string_t(first, _cur));
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_string()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_string()
 {
     auto string_opt = parse_stdstring();
     if (!string_opt) {
         return invalid_value<string_t>();
     }
-    return basic_value<string_t>(basic_value<string_t>::value_type::string, std::move(string_opt).value());
+    return basic_value<string_t>(
+        basic_value<string_t>::value_type::string,
+        std::move(string_opt).value());
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_array()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_array()
 {
     if (*_cur == '[') {
         ++_cur;
@@ -280,6 +306,12 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_ar
             return invalid_value<string_t>();
         }
 
+        if constexpr (accept_jsonc) {
+            if (*_cur == ']') {
+                break;
+            }
+        }
+
         basic_value<string_t> val = parse_value();
 
         if (!val.valid() || !skip_whitespace()) {
@@ -306,8 +338,8 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_ar
     return basic_array<string_t>(std::move(result));
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_object()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_object()
 {
     if (*_cur == '{') {
         ++_cur;
@@ -331,6 +363,12 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_ob
             return invalid_value<string_t>();
         }
 
+        if constexpr (accept_jsonc) {
+            if (*_cur == '}') {
+                break;
+            }
+        }
+
         auto key_opt = parse_stdstring();
 
         if (key_opt && skip_whitespace() && *_cur == ':') {
@@ -350,7 +388,10 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_ob
             return invalid_value<string_t>();
         }
 
-        result.emplace(std::move(*key_opt), std::move(val));
+        auto emplaced = result.emplace(std::move(*key_opt), std::move(val)).second;
+        if (!emplaced) {
+            return invalid_value<string_t>();
+        }
 
         if (*_cur == ',') {
             ++_cur;
@@ -370,8 +411,9 @@ inline basic_value<string_t> parser<string_t, parsing_t, accel_traits>::parse_ob
     return basic_object<string_t>(std::move(result));
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_stdstring()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline std::optional<string_t>
+    parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_stdstring()
 {
     if (*_cur == '"') {
         ++_cur;
@@ -382,6 +424,7 @@ inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_
 
     string_t result;
     auto no_escape_beg = _cur;
+    uint16_t pair_high = 0;
 
     while (_cur != _end) {
         if constexpr (sizeof(*_cur) == 1 && accel_traits::available) {
@@ -399,6 +442,9 @@ inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_
             if (_cur == _end) {
                 return std::nullopt;
             }
+            if (pair_high && *_cur != 'u') {
+                return std::nullopt;
+            }
             switch (*_cur) {
             case '"':
                 result.push_back('"');
@@ -424,9 +470,11 @@ inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_
             case 't':
                 result.push_back('\t');
                 break;
-                // case 'u':
-                //     result.push_back('\u');
-                //     break;
+            case 'u':
+                if (!skip_unicode_escape(pair_high, result)) {
+                    return std::nullopt;
+                }
+                break;
             default:
                 // Illegal backslash escape
                 return std::nullopt;
@@ -435,10 +483,16 @@ inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_
             break;
         }
         case '"': {
+            if (pair_high) {
+                return std::nullopt;
+            }
             result += string_t(no_escape_beg, _cur++);
             return result;
         }
         default:
+            if (pair_high) {
+                return std::nullopt;
+            }
             ++_cur;
             break;
         }
@@ -446,8 +500,106 @@ inline std::optional<string_t> parser<string_t, parsing_t, accel_traits>::parse_
     return std::nullopt;
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline bool parser<string_t, parsing_t, accel_traits>::skip_string_literal_with_accel()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_unicode_escape(
+    uint16_t& pair_high,
+    string_t& result)
+{
+    uint16_t cp = 0;
+    for (int i = 0; i < 4; ++i) {
+        if (++_cur == _end) {
+            return false;
+        }
+
+        if (!std::isxdigit(static_cast<unsigned char>(*_cur))) {
+            return false;
+        }
+
+        cp <<= 4;
+
+        if ('0' <= *_cur && *_cur <= '9') {
+            cp |= *_cur - '0';
+        }
+        else if ('a' <= *_cur && *_cur <= 'f') {
+            cp |= *_cur - 'a' + 10;
+        }
+        else if ('A' <= *_cur && *_cur <= 'F') {
+            cp |= *_cur - 'A' + 10;
+        }
+        else {
+            return false;
+        }
+    }
+
+    uint32_t ext_cp = cp;
+    uint16_t hi_cp = 0, lo_cp = 0;
+
+    if (0xD800 <= cp && cp <= 0xDBFF) {
+        if (pair_high) {
+            return false;
+        }
+        pair_high = cp;
+        return true;
+    }
+
+    if (0xDC00 <= cp && cp <= 0xDFFF) {
+        if (!pair_high) {
+            return false;
+        }
+        ext_cp = (((pair_high - 0xD800) << 10) | (cp - 0xDC00)) + 0x10000;
+        hi_cp = pair_high;
+        lo_cp = cp;
+        pair_high = 0;
+    }
+
+    if constexpr (std::is_same_v<typename string_t::value_type, char>) {
+        // utf8
+        if (ext_cp <= 0x7F) {
+            result.push_back(static_cast<char>(ext_cp));
+        }
+        else if (ext_cp <= 0x7FF) {
+            result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00011111) | 0b11000000u));
+            result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
+        }
+        else if (ext_cp <= 0xFFFF) {
+            result.push_back(static_cast<char>(((ext_cp >> 12) & 0b00001111) | 0b11100000u));
+            result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00111111) | 0b10000000u));
+            result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
+        }
+        else {
+            result.push_back(static_cast<char>(((ext_cp >> 18) & 0b00000111) | 0b11110000u));
+            result.push_back(static_cast<char>(((ext_cp >> 12) & 0b00111111) | 0b10000000u));
+            result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00111111) | 0b10000000u));
+            result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
+        }
+    }
+    else if constexpr (std::is_same_v<typename string_t::value_type, wchar_t>) {
+        if constexpr (sizeof(wchar_t) == 4) {
+            result.push_back(static_cast<wchar_t>(ext_cp));
+        }
+        else if constexpr (sizeof(wchar_t) == 2) {
+            if (ext_cp <= 0xFFFF) {
+                result.push_back(static_cast<wchar_t>(ext_cp));
+            }
+            else {
+                result.push_back(static_cast<wchar_t>(hi_cp));
+                result.push_back(static_cast<wchar_t>(lo_cp));
+            }
+        }
+        else {
+            static_assert(!sizeof(typename string_t::value_type), "Unsupported wchar");
+        }
+    }
+    else {
+        static_assert(!sizeof(typename string_t::value_type), "Unsupported type");
+    }
+
+    return true;
+}
+
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline bool
+    parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_string_literal_with_accel()
 {
     if constexpr (sizeof(*_cur) != 1) {
         return false;
@@ -456,8 +608,10 @@ inline bool parser<string_t, parsing_t, accel_traits>::skip_string_literal_with_
     while (_end - _cur >= accel_traits::step) {
         auto pack = accel_traits::load_unaligned(&(*_cur));
         auto result = accel_traits::less(pack, 32);
-        result = accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('"')));
-        result = accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('\\')));
+        result =
+            accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('"')));
+        result =
+            accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('\\')));
 
         if (accel_traits::is_all_zero(result)) {
             _cur += accel_traits::step;
@@ -472,8 +626,8 @@ inline bool parser<string_t, parsing_t, accel_traits>::skip_string_literal_with_
     return _cur != _end;
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline bool parser<string_t, parsing_t, accel_traits>::skip_whitespace() noexcept
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_whitespace() noexcept
 {
     while (_cur != _end) {
         switch (*_cur) {
@@ -483,6 +637,17 @@ inline bool parser<string_t, parsing_t, accel_traits>::skip_whitespace() noexcep
         case '\n':
             ++_cur;
             break;
+        case '/':
+            if constexpr (accept_jsonc) {
+                if (!skip_comment()) {
+                    return false;
+                }
+                // else continue;
+            }
+            else {
+                return false;
+            }
+            break;
         case '\0':
             return false;
         default:
@@ -492,8 +657,59 @@ inline bool parser<string_t, parsing_t, accel_traits>::skip_whitespace() noexcep
     return false;
 }
 
-template <typename string_t, typename parsing_t, typename accel_traits>
-inline bool parser<string_t, parsing_t, accel_traits>::skip_digit()
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+bool json::parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_comment() noexcept
+{
+    if (_cur == _end || *_cur != '/') {
+        return false;
+    }
+
+    if (++_cur == _end) {
+        return false;
+    }
+
+    enum class comment_type
+    {
+        invalid,
+        line,
+        block,
+    } t = comment_type::invalid;
+
+    switch (*_cur++) {
+    case '/':
+        t = comment_type::line;
+        break;
+    case '*':
+        t = comment_type::block;
+        break;
+    default:
+        return false;
+    }
+
+    while (_cur != _end) {
+        switch (*_cur++) {
+        case '\n':
+            if (t == comment_type::line) {
+                return true;
+            }
+            break;
+        case '*':
+            if (t == comment_type::block && _cur != _end && *_cur == '/') {
+                ++_cur;
+                return true;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    // _cur == _end
+    return t == comment_type::line;
+}
+
+template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
+inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_digit()
 {
     // At least one digit
     if (_cur != _end && std::isdigit(*_cur)) {
@@ -523,7 +739,7 @@ template <typename parsing_t>
 auto parse(const parsing_t& content)
 {
     using string_t = std::basic_string<typename parsing_t::value_type>;
-    return parser<string_t, parsing_t>::parse(content);
+    return parser<false, string_t, parsing_t>::parse(content);
 }
 
 template <typename char_t>
@@ -533,7 +749,7 @@ auto parse(char_t* content)
 }
 
 template <typename istream_t, typename _>
-auto parse(istream_t& ifs, bool check_bom)
+auto parse(istream_t& ifs, bool check_bom, bool with_commets)
 {
     using string_t = std::basic_string<typename istream_t::char_type>;
 
@@ -551,16 +767,16 @@ auto parse(istream_t& ifs, bool check_bom)
         static constexpr uchar Bom_1 = 0xBB;
         static constexpr uchar Bom_2 = 0xBF;
 
-        if (str.size() >= 3 && static_cast<uchar>(str.at(0)) == Bom_0 && static_cast<uchar>(str.at(1)) == Bom_1 &&
-            static_cast<uchar>(str.at(2)) == Bom_2) {
+        if (str.size() >= 3 && static_cast<uchar>(str.at(0)) == Bom_0
+            && static_cast<uchar>(str.at(1)) == Bom_1 && static_cast<uchar>(str.at(2)) == Bom_2) {
             str.assign(str.begin() + 3, str.end());
         }
     }
-    return parse(str);
+    return with_commets ? parsec(str) : parse(str);
 }
 
 template <typename ifstream_t, typename path_t>
-auto open(const path_t& filepath, bool check_bom)
+auto open(const path_t& filepath, bool check_bom, bool with_commets)
 {
     using char_t = typename ifstream_t::char_type;
     using string_t = std::basic_string<char_t>;
@@ -571,57 +787,76 @@ auto open(const path_t& filepath, bool check_bom)
     if (!ifs.is_open()) {
         return return_t(std::nullopt);
     }
-    auto opt = parse(ifs, check_bom);
+    auto opt = parse(ifs, check_bom, with_commets);
     ifs.close();
     return opt;
 }
 
+template <typename parsing_t>
+auto parsec(const parsing_t& content)
+{
+    using string_t = std::basic_string<typename parsing_t::value_type>;
+    return parser<true, string_t, parsing_t>::parse(content);
+}
+
+template <typename char_t>
+auto parsec(char_t* content)
+{
+    return parsec(std::basic_string_view<std::decay_t<char_t>> { content });
+}
+
 namespace literals
 {
-    inline value operator""_json(const char* str, size_t len)
-    {
-        return operator""_jvalue(str, len);
-    }
-    inline wvalue operator""_json(const wchar_t* str, size_t len)
-    {
-        return operator""_jvalue(str, len);
-    }
+inline value operator""_json(const char* str, size_t len)
+{
+    return operator""_jvalue(str, len);
+}
 
-    inline value operator""_jvalue(const char* str, size_t len)
-    {
-        return parse(std::string_view(str, len)).value_or(value());
-    }
-    inline wvalue operator""_jvalue(const wchar_t* str, size_t len)
-    {
-        return parse(std::wstring_view(str, len)).value_or(wvalue());
-    }
+inline wvalue operator""_json(const wchar_t* str, size_t len)
+{
+    return operator""_jvalue(str, len);
+}
 
-    inline array operator""_jarray(const char* str, size_t len)
-    {
-        auto val = parse(std::string_view(str, len)).value_or(value());
-        return val.is_array() ? val.as_array() : array();
-    }
-    inline warray operator""_jarray(const wchar_t* str, size_t len)
-    {
-        auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
-        return val.is_array() ? val.as_array() : warray();
-    }
+inline value operator""_jvalue(const char* str, size_t len)
+{
+    return parse(std::string_view(str, len)).value_or(value());
+}
 
-    inline object operator""_jobject(const char* str, size_t len)
-    {
-        auto val = parse(std::string_view(str, len)).value_or(value());
-        return val.is_object() ? val.as_object() : object();
-    }
-    inline wobject operator""_jobject(const wchar_t* str, size_t len)
-    {
-        auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
-        return val.is_object() ? val.as_object() : wobject();
-    }
+inline wvalue operator""_jvalue(const wchar_t* str, size_t len)
+{
+    return parse(std::wstring_view(str, len)).value_or(wvalue());
+}
+
+inline array operator""_jarray(const char* str, size_t len)
+{
+    auto val = parse(std::string_view(str, len)).value_or(value());
+    return val.is_array() ? val.as_array() : array();
+}
+
+inline warray operator""_jarray(const wchar_t* str, size_t len)
+{
+    auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
+    return val.is_array() ? val.as_array() : warray();
+}
+
+inline object operator""_jobject(const char* str, size_t len)
+{
+    auto val = parse(std::string_view(str, len)).value_or(value());
+    return val.is_object() ? val.as_object() : object();
+}
+
+inline wobject operator""_jobject(const wchar_t* str, size_t len)
+{
+    auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
+    return val.is_object() ? val.as_object() : wobject();
+}
 } // namespace literals
 
 template <typename string_t>
 const basic_value<string_t> invalid_value()
 {
-    return basic_value<string_t>(basic_value<string_t>::value_type::invalid, typename basic_value<string_t>::var_t());
+    return basic_value<string_t>(
+        basic_value<string_t>::value_type::invalid,
+        typename basic_value<string_t>::var_t());
 }
 } // namespace json

3rdparty/include/meojson/reflection/extensions.hpp

@@ -0,0 +1,656 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
+#pragma once
+
+#include <cstddef>
+#include <filesystem>
+#include <queue>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <variant>
+
+#include "../common/types.hpp"
+
+namespace json::ext
+{
+
+template <typename string_t, typename impl_t, typename var_t, size_t len> // (size_t)-1 for no
+                                                                          // restriction
+class __jsonization_array
+{
+public:
+    json::basic_value<string_t> to_json(const var_t& value) const
+    {
+        return static_cast<const impl_t*>(this)->to_json_array(value);
+    }
+
+    bool check_json(const json::basic_value<string_t>& json) const
+    {
+        if (!json.is_array()) {
+            return false;
+        }
+        const auto& arr = json.as_array();
+        if constexpr (len != static_cast<size_t>(-1)) {
+            if (len != arr.size()) {
+                return false;
+            }
+        }
+        return static_cast<const impl_t*>(this)->check_json_array(arr);
+    }
+
+    bool from_json(const json::basic_value<string_t>& json, var_t& value) const
+    {
+        if (!json.is_array()) {
+            return false;
+        }
+        const auto& arr = json.as_array();
+        if constexpr (len != static_cast<size_t>(-1)) {
+            if (len != arr.size()) {
+                return false;
+            }
+        }
+        return static_cast<const impl_t*>(this)->from_json_array(arr, value);
+    }
+
+    json::basic_value<string_t> move_to_json(var_t value) const
+    {
+        return static_cast<const impl_t*>(this)->move_to_json_array(std::move(value));
+    }
+
+    bool move_from_json(json::basic_value<string_t> json, var_t& value) const
+    {
+        if (!json.is_array()) {
+            return false;
+        }
+        auto& arr = json.as_array();
+        if constexpr (len != static_cast<size_t>(-1)) {
+            if (len != arr.size()) {
+                return false;
+            }
+        }
+        return static_cast<const impl_t*>(this)->move_from_json_array(std::move(arr), value);
+    }
+};
+
+template <typename string_t, typename impl_t, typename var_t>
+class __jsonization_object
+{
+public:
+    json::basic_value<string_t> to_json(const var_t& value) const
+    {
+        return static_cast<const impl_t*>(this)->to_json_object(value);
+    }
+
+    bool check_json(const json::basic_value<string_t>& json) const
+    {
+        if (!json.is_object()) {
+            return false;
+        }
+        const auto& obj = json.as_object();
+        return static_cast<const impl_t*>(this)->check_json_object(obj);
+    }
+
+    bool from_json(const json::basic_value<string_t>& json, var_t& value) const
+    {
+        if (!json.is_object()) {
+            return false;
+        }
+        const auto& obj = json.as_object();
+        return static_cast<const impl_t*>(this)->from_json_object(obj, value);
+    }
+
+    json::basic_value<string_t> move_to_json(var_t value) const
+    {
+        return static_cast<const impl_t*>(this)->move_to_json_object(std::move(value));
+    }
+
+    bool move_from_json(json::basic_value<string_t> json, var_t& value) const
+    {
+        if (!json.is_object()) {
+            return false;
+        }
+        auto& obj = json.as_object();
+        return static_cast<const impl_t*>(this)->move_from_json_object(std::move(obj), value);
+    }
+};
+
+template <typename string_t>
+class jsonization<string_t, std::nullptr_t>
+{
+public:
+    json::basic_value<string_t> to_json(const std::nullptr_t&) const
+    {
+        return json::basic_value<string_t> {};
+    }
+
+    bool check_json(const json::basic_value<string_t>& json) const { return json.is_null(); }
+
+    bool from_json(const json::basic_value<string_t>& json, std::nullptr_t&)
+    {
+        return check_json(json);
+    }
+};
+
+template <typename string_t>
+class jsonization<
+    string_t,
+    std::filesystem::path,
+    std::enable_if_t<
+        std::is_same_v<string_t, std::filesystem::path::string_type>
+        || std::is_same_v<string_t, std::string>>>
+{
+public:
+    json::basic_value<string_t> to_json(const std::filesystem::path& path) const
+    {
+        if constexpr (std::is_same_v<string_t, std::filesystem::path::string_type>) {
+            return path.native();
+        }
+        else if constexpr (std::is_same_v<string_t, std::string>) {
+#if __cplusplus >= 202002L
+            std::u8string u8str = path.u8string();
+            return std::string { u8str.begin(), u8str.end() };
+#else
+            return path.u8string();
+#endif
+        }
+#if __cplusplus >= 202002L
+        else if constexpr (std::is_same_v<string_t, std::u8string>) {
+            return path.u8string();
+        }
+#endif
+    }
+
+    bool check_json(const json::basic_value<string_t>& json) const { return json.is_string(); }
+
+    bool from_json(const json::basic_value<string_t>& json, std::filesystem::path& path) const
+    {
+        path = json.as_string();
+        return true;
+    }
+};
+
+template <
+    typename string_t,
+    template <typename, size_t> typename arr_t,
+    typename value_t,
+    size_t size>
+class jsonization<string_t, arr_t<value_t, size>>
+    : public __jsonization_array<
+          string_t,
+          jsonization<string_t, arr_t<value_t, size>>,
+          arr_t<value_t, size>,
+          size>
+{
+public:
+    json::basic_array<string_t> to_json_array(const arr_t<value_t, size>& value) const
+    {
+        json::basic_array<string_t> result;
+        for (size_t i = 0; i < size; i++) {
+            result.emplace_back(value.at(i));
+        }
+        return result;
+    }
+
+    bool check_json_array(const json::basic_array<string_t>& arr) const
+    {
+        return arr.template all<value_t>();
+    }
+
+    bool from_json_array(const json::basic_array<string_t>& arr, arr_t<value_t, size>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        for (size_t i = 0; i < size; i++) {
+            value.at(i) = arr[i].template as<value_t>();
+        }
+        return true;
+    }
+
+    json::basic_array<string_t> move_to_json_array(arr_t<value_t, size> value) const
+    {
+        json::basic_array<string_t> result;
+        for (size_t i = 0; i < size; i++) {
+            result.emplace_back(std::move(value.at(i)));
+        }
+        return result;
+    }
+
+    bool move_from_json_array(json::basic_array<string_t> arr, arr_t<value_t, size>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        for (size_t i = 0; i < size; i++) {
+            value.at(i) = std::move(arr[i]).template as<value_t>();
+        }
+        return true;
+    }
+};
+
+template <typename string_t, typename collection_t>
+class jsonization<string_t, collection_t, std::enable_if_t<_utils::is_collection<collection_t>>>
+    : public __jsonization_array<
+          string_t,
+          jsonization<string_t, collection_t>,
+          collection_t,
+          (size_t)-1>
+{
+public:
+    json::basic_array<string_t> to_json_array(const collection_t& value) const
+    {
+        json::basic_array<string_t> result;
+        for (const auto& val : value) {
+            result.emplace_back(val);
+        }
+        return result;
+    }
+
+    bool check_json_array(const json::basic_array<string_t>& arr) const
+    {
+        return arr.template all<typename collection_t::value_type>();
+    }
+
+    bool from_json_array(const json::basic_array<string_t>& arr, collection_t& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        value = {};
+        for (const auto& val : arr) {
+            if constexpr (_utils::has_emplace_back<collection_t>::value) {
+                value.emplace_back(val.template as<typename collection_t::value_type>());
+            }
+            else {
+                value.emplace(val.template as<typename collection_t::value_type>());
+            }
+        }
+        return true;
+    }
+
+    json::basic_array<string_t> move_to_json_array(collection_t value) const
+    {
+        json::basic_array<string_t> result;
+        for (auto& val : value) {
+            result.emplace_back(std::move(val));
+        }
+        return result;
+    }
+
+    bool move_from_json_array(json::basic_array<string_t> arr, collection_t& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        for (auto& val : arr) {
+            if constexpr (_utils::has_emplace_back<collection_t>::value) {
+                value.emplace_back(std::move(val).template as<typename collection_t::value_type>());
+            }
+            else {
+                value.emplace(std::move(val).template as<typename collection_t::value_type>());
+            }
+        }
+        return true;
+    }
+};
+
+template <typename string_t, template <typename...> typename tuple_t, typename... args_t>
+class jsonization<
+    string_t,
+    tuple_t<args_t...>,
+    std::enable_if_t<_utils::is_tuple_like<tuple_t<args_t...>>>>
+    : public __jsonization_array<
+          string_t,
+          jsonization<string_t, tuple_t<args_t...>>,
+          tuple_t<args_t...>,
+          std::tuple_size_v<tuple_t<args_t...>>>
+{
+public:
+    constexpr static size_t tuple_size = std::tuple_size_v<tuple_t<args_t...>>;
+
+    json::basic_array<string_t> to_json_array(const tuple_t<args_t...>& value) const
+    {
+        json::basic_array<string_t> result;
+        to_json_impl(result, value, std::make_index_sequence<tuple_size>());
+        return result;
+    }
+
+    template <std::size_t... Is>
+    void to_json_impl(
+        json::basic_array<string_t>& arr,
+        const tuple_t<args_t...>& t,
+        std::index_sequence<Is...>) const
+    {
+        using std::get;
+        (arr.emplace_back(get<Is>(t)), ...);
+    }
+
+    bool check_json_array(const json::basic_array<string_t>& arr) const
+    {
+        return check_json_impl(arr, std::make_index_sequence<tuple_size>());
+    }
+
+    template <std::size_t... Is>
+    bool check_json_impl(const json::basic_array<string_t>& arr, std::index_sequence<Is...>) const
+    {
+        return (arr[Is].template is<std::tuple_element_t<Is, tuple_t<args_t...>>>() && ...);
+    }
+
+    bool from_json_array(const json::basic_array<string_t>& arr, tuple_t<args_t...>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        from_json_impl(arr, value, std::make_index_sequence<tuple_size>());
+        return true;
+    }
+
+    template <std::size_t... Is>
+    void from_json_impl(
+        const json::basic_array<string_t>& arr,
+        tuple_t<args_t...>& t,
+        std::index_sequence<Is...>) const
+    {
+        using std::get;
+        ((get<Is>(t) = arr[Is].template as<std::tuple_element_t<Is, tuple_t<args_t...>>>()), ...);
+    }
+
+    json::basic_array<string_t> move_to_json_array(tuple_t<args_t...> value) const
+    {
+        json::basic_array<string_t> result;
+        move_to_json_impl(result, std::move(value), std::make_index_sequence<tuple_size>());
+        return result;
+    }
+
+    template <std::size_t... Is>
+    void move_to_json_impl(
+        json::basic_array<string_t>& arr,
+        tuple_t<args_t...> t,
+        std::index_sequence<Is...>) const
+    {
+        using std::get;
+        (arr.emplace_back(std::move(get<Is>(t))), ...);
+    }
+
+    bool move_from_json_array(json::basic_array<string_t> arr, tuple_t<args_t...>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        move_from_json_impl(arr, value, std::make_index_sequence<tuple_size>());
+        return true;
+    }
+
+    template <std::size_t... Is>
+    void move_from_json_impl(
+        json::basic_array<string_t> arr,
+        tuple_t<args_t...>& t,
+        std::index_sequence<Is...>) const
+    {
+        using std::get;
+        ((get<Is>(t) =
+              std::move(arr[Is]).template as<std::tuple_element_t<Is, tuple_t<args_t...>>>()),
+         ...);
+    }
+};
+
+template <typename string_t, typename map_t>
+class jsonization<
+    string_t,
+    map_t,
+    std::enable_if_t<_utils::is_map<map_t> && std::is_same_v<typename map_t::key_type, string_t>>>
+    : public __jsonization_object<string_t, jsonization<string_t, map_t>, map_t>
+{
+public:
+    json::basic_object<string_t> to_json_object(const map_t& value) const
+    {
+        json::basic_object<string_t> result;
+        for (const auto& [key, val] : value) {
+            result.emplace(key, val);
+        }
+        return result;
+    }
+
+    bool check_json_object(const json::basic_object<string_t>& arr) const
+    {
+        for (const auto& [key, val] : arr) {
+            if (!val.template is<typename map_t::mapped_type>()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool from_json_object(const json::basic_object<string_t>& arr, map_t& value) const
+    {
+        // TODO: 是不是直接from不check了算了
+        if (!check_json_object(arr)) {
+            return false;
+        }
+
+        value = {};
+        for (const auto& [key, val] : arr) {
+            value.emplace(key, val.template as<typename map_t::mapped_type>());
+        }
+        return true;
+    }
+
+    json::basic_object<string_t> move_to_json_object(map_t value) const
+    {
+        json::basic_object<string_t> result;
+        for (auto& [key, val] : value) {
+            result.emplace(key, std::move(val));
+        }
+        return result;
+    }
+
+    bool move_from_json_object(json::basic_object<string_t> arr, map_t& value) const
+    {
+        // TODO: 是不是直接from不check了算了
+        if (!check_json_object(arr)) {
+            return false;
+        }
+
+        value = {};
+        for (auto& [key, val] : arr) {
+            value.emplace(key, std::move(val).template as<typename map_t::mapped_type>());
+        }
+        return true;
+    }
+};
+
+template <typename string_t, typename... args_t>
+class jsonization<string_t, std::variant<args_t...>>
+{
+public:
+    using variant_t = std::variant<args_t...>;
+    constexpr static size_t variant_size = std::variant_size_v<variant_t>;
+
+    json::basic_value<string_t> to_json(const variant_t& value) const
+    {
+        json::basic_value<string_t> result;
+        to_json_impl(result, value, std::make_index_sequence<variant_size>());
+        return result;
+    }
+
+    template <std::size_t... Is>
+    void to_json_impl(
+        json::basic_value<string_t>& val,
+        const variant_t& t,
+        std::index_sequence<Is...>) const
+    {
+        using std::get;
+        std::ignore = ((t.index() == Is ? (val = get<Is>(t), true) : false) || ...);
+    }
+
+    bool check_json(const json::basic_value<string_t>& json) const
+    {
+        return check_json_impl(json, std::make_index_sequence<variant_size>());
+    }
+
+    template <std::size_t... Is>
+    bool check_json_impl(const json::basic_value<string_t>& val, std::index_sequence<Is...>) const
+    {
+        return (val.template is<std::variant_alternative_t<Is, variant_t>>() || ...);
+    }
+
+    bool from_json(const json::basic_value<string_t>& json, variant_t& value) const
+    {
+        if (!check_json_impl(json, std::make_index_sequence<variant_size>())) {
+            return false;
+        }
+
+        from_json_impl(json, value, std::make_index_sequence<variant_size>());
+        return true;
+    }
+
+    template <std::size_t... Is>
+    void from_json_impl(
+        const json::basic_value<string_t>& json,
+        variant_t& t,
+        std::index_sequence<Is...>) const
+    {
+        std::ignore =
+            ((json.template is<std::variant_alternative_t<Is, variant_t>>()
+                  ? (t = json.template as<std::variant_alternative_t<Is, variant_t>>(), true)
+                  : false)
+             || ...);
+    }
+
+    json::basic_value<string_t> move_to_json(variant_t value) const
+    {
+        json::basic_value<string_t> result;
+        move_to_json_impl(result, std::move(value), std::make_index_sequence<variant_size>());
+        return result;
+    }
+
+    template <std::size_t... Is>
+    void
+        move_to_json_impl(json::basic_value<string_t>& val, variant_t t, std::index_sequence<Is...>)
+            const
+    {
+        using std::get;
+        std::ignore = ((t.index() == Is ? (val = std::move(get<Is>(t)), true) : false) || ...);
+    }
+
+    bool move_from_json(json::basic_value<string_t> json, variant_t& value) const
+    {
+        if (!check_json_impl(json, std::make_index_sequence<variant_size>())) {
+            return false;
+        }
+
+        move_from_json_impl(std::move(json), value, std::make_index_sequence<variant_size>());
+        return true;
+    }
+
+    template <std::size_t... Is>
+    void move_from_json_impl(
+        json::basic_value<string_t> json,
+        variant_t& t,
+        std::index_sequence<Is...>) const
+    {
+        std::ignore =
+            ((json.template is<std::variant_alternative_t<Is, variant_t>>()
+                  ? (t = std::move(json).template as<std::variant_alternative_t<Is, variant_t>>(),
+                     true)
+                  : false)
+             || ...);
+    }
+};
+
+// TODO: check if has move_xxx in member
+template <typename string_t, typename var_t>
+class jsonization<
+    string_t,
+    var_t,
+    std::enable_if_t<
+        _utils::has_to_json_in_member<var_t>::value
+        && _utils::has_check_json_in_member<var_t, string_t>::value
+        && _utils::has_from_json_in_member<var_t, string_t>::value>>
+{
+public:
+    json::basic_value<string_t> to_json(const var_t& value) const { return value.to_json(); }
+
+    bool check_json(const json::basic_value<string_t>& json) const
+    {
+        var_t value;
+        return value.check_json(json);
+    }
+
+    bool from_json(const json::basic_value<string_t>& json, var_t& value) const
+    {
+        return value.from_json(json);
+    }
+
+    json::basic_value<string_t> move_to_json(var_t value) const { return to_json(value); }
+
+    bool move_from_json(json::basic_value<string_t> json, var_t& value) const
+    {
+        return from_json(json, value);
+    }
+};
+
+// really need this fucking queue?
+template <typename string_t, typename value_t>
+class jsonization<string_t, std::queue<value_t>>
+    : public __jsonization_array<
+          string_t,
+          jsonization<string_t, std::queue<value_t>>,
+          std::queue<value_t>,
+          (size_t)-1>
+{
+public:
+    json::basic_array<string_t> to_json_array(const std::queue<value_t>& value) const
+    {
+        return move_to_json_array(value);
+    }
+
+    bool check_json_array(const json::basic_array<string_t>& arr) const
+    {
+        return arr.template all<value_t>();
+    }
+
+    bool from_json_array(const json::basic_array<string_t>& arr, std::queue<value_t>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        value = {};
+        for (const auto& val : arr) {
+            value.emplace(val.template as<value_t>());
+        }
+        return true;
+    }
+
+    json::basic_array<string_t> move_to_json_array(std::queue<value_t> value) const
+    {
+        json::basic_array<string_t> result;
+        while (!value.empty()) {
+            result.emplace_back(std::move(value.front()));
+            value.pop();
+        }
+        return result;
+    }
+
+    bool move_from_json_array(json::basic_array<string_t> arr, std::queue<value_t>& value) const
+    {
+        if (!check_json_array(arr)) {
+            return false;
+        }
+
+        for (auto& val : arr) {
+            value.emplace(std::move(val).template as<value_t>());
+        }
+        return true;
+    }
+};
+
+}

3rdparty/include/meojson/reflection/jsonization.hpp

@@ -1,94 +1,298 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <string>
 #include <type_traits>
+#include <utility>
 
 #include "../common/types.hpp"
+#include "extensions.hpp"
 
 namespace json::_jsonization_helper
 {
+
+template <typename value_t>
+struct is_optional_t : public std::false_type
+{
+};
+
+template <typename value_t>
+struct is_optional_t<std::optional<value_t>> : public std::true_type
+{
+};
+
+template <typename value_t>
+inline constexpr bool is_optional_v = is_optional_t<value_t>::value;
+
 struct next_is_optional_t
-{};
+{
+};
+
+struct next_override_key_t
+{
+    const char* key;
+};
+
+struct next_state_t
+{
+    bool is_optional = false;
+    const char* override_key = nullptr;
+};
+
 struct va_arg_end
-{};
+{
+};
+
+template <typename tag_t>
+struct is_tag_t : public std::false_type
+{
+};
+
+template <>
+struct is_tag_t<next_is_optional_t> : public std::true_type
+{
+};
+
+template <>
+struct is_tag_t<next_override_key_t> : public std::true_type
+{
+};
 
 struct dumper
 {
-    template <typename var_t, typename... rest_t>
-    json::value _to_json(const char* key, const var_t& var, rest_t&&... rest) const
-    {
-        json::value result = _to_json(std::forward<rest_t>(rest)...);
-        result.emplace(key, var);
-        return result;
-    }
+    void _to_json(json::object&, va_arg_end) const {}
+
     template <typename... rest_t>
-    json::value _to_json(const char*, next_is_optional_t, rest_t&&... rest) const
+    void _to_json(json::object& result, const char* key, rest_t&&... rest) const
     {
-        return _to_json(std::forward<rest_t>(rest)...);
+        _to_json(result, next_state_t {}, key, std::forward<rest_t>(rest)...);
+    }
+
+    template <
+        typename var_t,
+        typename... rest_t,
+        typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
+    void _to_json(
+        json::object& result,
+        next_state_t state,
+        const char* key,
+        const var_t& var,
+        rest_t&&... rest) const
+    {
+        if (state.override_key) {
+            key = state.override_key;
+        }
+        if constexpr (is_optional_v<var_t>) {
+            if (!state.is_optional) {
+                throw exception("std::optional must be used with MEO_OPT");
+            }
+
+            if (var.has_value()) {
+                result.emplace(key, var.value());
+            }
+        }
+        else {
+            result.emplace(key, var);
+        }
+        _to_json(result, std::forward<rest_t>(rest)...);
+    }
+
+    template <typename... rest_t>
+    void _to_json(
+        json::object& result,
+        next_state_t state,
+        const char*,
+        next_is_optional_t,
+        rest_t&&... rest) const
+    {
+        state.is_optional = true;
+        _to_json(result, state, std::forward<rest_t>(rest)...);
+    }
+
+    template <typename... rest_t>
+    void _to_json(
+        json::object& result,
+        next_state_t state,
+        const char*,
+        next_override_key_t override_key,
+        rest_t&&... rest) const
+    {
+        state.override_key = override_key.key;
+        _to_json(result, state, std::forward<rest_t>(rest)...);
     }
-    json::value _to_json(va_arg_end) const { return {}; }
 };
 
 struct checker
 {
-    template <typename var_t, typename... rest_t>
-    bool _check_json(const json::value& in, std::string& error_key, const char* key, const var_t&,
-                     rest_t&&... rest) const
+    bool _check_json(const json::value&, std::string&, va_arg_end) const { return true; }
+
+    template <typename... rest_t>
+    bool _check_json(
+        const json::value& in,
+        std::string& error_key,
+        const char* key,
+        rest_t&&... rest) const
     {
-        auto opt = in.find(key);
-        if (!opt || !opt->is<var_t>()) {
-            error_key = key;
-            return false;
-        }
-        return _check_json(in, error_key, std::forward<rest_t>(rest)...);
+        return _check_json(in, error_key, next_state_t {}, key, std::forward<rest_t>(rest)...);
     }
-    template <typename var_t, typename... rest_t>
-    bool _check_json(const json::value& in, std::string& error_key, const char*, next_is_optional_t, const char* key,
-                     const var_t&, rest_t&&... rest) const
+
+    template <
+        typename var_t,
+        typename... rest_t,
+        typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
+    bool _check_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char* key,
+        const var_t&,
+        rest_t&&... rest) const
     {
+        if (state.override_key) {
+            key = state.override_key;
+        }
         auto opt = in.find(key);
-        if (opt) {
-            if (!opt->is<var_t>()) {
+        if constexpr (is_optional_v<var_t>) {
+            if (!state.is_optional) {
+                throw exception("std::optional must be used with MEO_OPT");
+            }
+
+            if (opt && !opt->is<typename var_t::value_type>()) {
                 error_key = key;
                 return false;
             }
-        } // next_is_optional_t, ignore key not found
-
+        }
+        else {
+            if (state.is_optional) {
+                if (opt && !opt->is<var_t>()) {
+                    error_key = key;
+                    return false;
+                } // is_optional, ignore key not found
+            }
+            else if (!opt || !opt->is<var_t>()) {
+                error_key = key;
+                return false;
+            }
+        }
         return _check_json(in, error_key, std::forward<rest_t>(rest)...);
     }
-    bool _check_json(const json::value&, std::string&, va_arg_end) const { return true; }
+
+    template <typename... rest_t>
+    bool _check_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char*,
+        next_is_optional_t,
+        rest_t&&... rest) const
+    {
+        state.is_optional = true;
+        return _check_json(in, error_key, state, std::forward<rest_t>(rest)...);
+    }
+
+    template <typename... rest_t>
+    bool _check_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char*,
+        next_override_key_t override_key,
+        rest_t&&... rest) const
+    {
+        state.override_key = override_key.key;
+        return _check_json(in, error_key, state, std::forward<rest_t>(rest)...);
+    }
 };
 
 struct loader
 {
-    template <typename var_t, typename... rest_t>
-    bool _from_json(const json::value& in, std::string& error_key, const char* key, var_t& var, rest_t&&... rest) const
-    {
-        auto opt = in.find(key);
-        if (!opt || !opt->is<var_t>()) {
-            error_key = key;
-            return false;
-        }
-        var = std::move(opt)->as<var_t>();
+    bool _from_json(const json::value&, std::string&, va_arg_end) const { return true; }
 
-        return _from_json(in, error_key, std::forward<rest_t>(rest)...);
-    }
-    template <typename var_t, typename... rest_t>
-    bool _from_json(const json::value& in, std::string& error_key, const char*, next_is_optional_t, const char* key,
-                    var_t& var, rest_t&&... rest) const
+    template <typename... rest_t>
+    bool
+        _from_json(const json::value& in, std::string& error_key, const char* key, rest_t&&... rest)
     {
+        return _from_json(in, error_key, next_state_t {}, key, std::forward<rest_t>(rest)...);
+    }
+
+    template <
+        typename var_t,
+        typename... rest_t,
+        typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
+    bool _from_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char* key,
+        var_t& var,
+        rest_t&&... rest)
+    {
+        if (state.override_key) {
+            key = state.override_key;
+        }
         auto opt = in.find(key);
-        if (opt) {
-            if (!opt->is<var_t>()) {
+        if constexpr (is_optional_v<var_t>) {
+            if (!state.is_optional) {
+                throw exception("std::optional must be used with MEO_OPT");
+            }
+
+            if (opt && !opt->is<typename var_t::value_type>()) {
                 error_key = key;
                 return false;
             }
-            var = std::move(opt)->as<var_t>();
-        } // next_is_optional_t, ignore key not found
+            if (opt) {
+                var = std::move(opt)->as<typename var_t::value_type>();
+            }
+            else {
+                var = std::nullopt;
+            }
+        }
+        else {
+            if (state.is_optional) {
+                if (opt && !opt->is<var_t>()) {
+                    error_key = key;
+                    return false;
+                } // is_optional, ignore key not found
+            }
+            else if (!opt || !opt->is<var_t>()) {
+                error_key = key;
+                return false;
+            }
+
+            if (opt) {
+                var = std::move(opt)->as<var_t>();
+            }
+        }
 
         return _from_json(in, error_key, std::forward<rest_t>(rest)...);
     }
-    bool _from_json(const json::value&, std::string&, va_arg_end) const { return true; }
+
+    template <typename... rest_t>
+    bool _from_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char*,
+        next_is_optional_t,
+        rest_t&&... rest)
+    {
+        state.is_optional = true;
+        return _from_json(in, error_key, state, std::forward<rest_t>(rest)...);
+    }
+
+    template <typename... rest_t>
+    bool _from_json(
+        const json::value& in,
+        std::string& error_key,
+        next_state_t state,
+        const char*,
+        next_override_key_t override_key,
+        rest_t&&... rest)
+    {
+        state.override_key = override_key.key;
+        return _from_json(in, error_key, state, std::forward<rest_t>(rest)...);
+    }
 };
 } // namespace json::_jsonization_helper
 
@@ -109,124 +313,326 @@ namespace json::_private_macro
 
 #define _MEOJSON_EXPAND(x) x
 
-#define _MEOJSON_FOR_EACH_0(pred, ...)
-#define _MEOJSON_FOR_EACH_1(pred, x, ...) pred(x)
-#define _MEOJSON_FOR_EACH_2(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_1(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_3(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_2(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_4(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_3(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_5(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_4(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_6(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_5(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_7(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_6(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_8(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_7(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_9(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_8(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_10(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_9(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_11(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_10(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_12(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_11(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_13(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_12(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_14(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_13(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_15(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_14(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_16(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_15(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_17(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_16(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_18(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_17(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_19(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_18(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_20(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_19(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_21(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_20(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_22(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_21(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_23(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_22(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_24(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_23(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_25(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_24(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_26(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_25(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_27(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_26(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_28(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_27(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_29(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_28(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_30(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_29(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_31(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_30(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_32(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_31(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_33(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_32(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_34(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_33(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_35(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_34(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_36(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_35(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_37(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_36(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_38(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_37(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_39(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_38(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_40(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_39(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_41(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_40(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_42(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_41(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_43(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_42(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_44(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_43(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_45(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_44(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_46(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_45(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_47(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_46(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_48(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_47(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_49(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_48(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_50(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_49(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_51(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_50(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_52(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_51(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_53(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_52(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_54(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_53(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_55(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_54(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_56(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_55(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_57(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_56(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_58(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_57(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_59(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_58(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_60(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_59(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_61(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_60(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_62(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_61(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_63(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_62(pred, __VA_ARGS__))
-#define _MEOJSON_FOR_EACH_64(pred, x, ...) pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_63(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_1(pred, x) pred(x)
+#define _MEOJSON_FOR_EACH_2(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_1(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_3(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_2(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_4(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_3(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_5(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_4(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_6(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_5(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_7(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_6(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_8(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_7(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_9(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_8(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_10(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_9(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_11(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_10(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_12(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_11(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_13(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_12(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_14(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_13(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_15(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_14(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_16(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_15(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_17(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_16(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_18(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_17(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_19(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_18(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_20(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_19(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_21(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_20(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_22(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_21(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_23(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_22(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_24(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_23(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_25(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_24(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_26(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_25(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_27(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_26(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_28(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_27(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_29(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_28(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_30(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_29(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_31(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_30(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_32(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_31(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_33(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_32(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_34(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_33(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_35(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_34(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_36(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_35(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_37(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_36(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_38(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_37(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_39(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_38(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_40(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_39(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_41(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_40(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_42(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_41(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_43(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_42(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_44(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_43(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_45(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_44(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_46(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_45(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_47(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_46(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_48(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_47(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_49(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_48(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_50(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_49(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_51(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_50(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_52(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_51(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_53(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_52(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_54(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_53(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_55(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_54(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_56(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_55(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_57(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_56(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_58(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_57(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_59(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_58(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_60(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_59(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_61(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_60(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_62(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_61(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_63(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_62(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_64(pred, x, ...) \
+    pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_63(pred, __VA_ARGS__))
 
-#define _MEOJSON_ARG_COUNT(...)                                                                                       \
-    _MEOJSON_EXPAND(_MEOJSON_ARG_COUNT1(0, ##__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, \
-                                        49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31,   \
-                                        30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,   \
-                                        11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
-#define _MEOJSON_ARG_COUNT1(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, \
-                            _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, \
-                            _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, \
-                            _56, _57, _58, _59, _60, _61, _62, _63, _64, N, ...)                                      \
+#define _MEOJSON_ARG_COUNT(...)          \
+    _MEOJSON_EXPAND(_MEOJSON_ARG_COUNT1( \
+        0,                               \
+        ##__VA_ARGS__,                   \
+        64,                              \
+        63,                              \
+        62,                              \
+        61,                              \
+        60,                              \
+        59,                              \
+        58,                              \
+        57,                              \
+        56,                              \
+        55,                              \
+        54,                              \
+        53,                              \
+        52,                              \
+        51,                              \
+        50,                              \
+        49,                              \
+        48,                              \
+        47,                              \
+        46,                              \
+        45,                              \
+        44,                              \
+        43,                              \
+        42,                              \
+        41,                              \
+        40,                              \
+        39,                              \
+        38,                              \
+        37,                              \
+        36,                              \
+        35,                              \
+        34,                              \
+        33,                              \
+        32,                              \
+        31,                              \
+        30,                              \
+        29,                              \
+        28,                              \
+        27,                              \
+        26,                              \
+        25,                              \
+        24,                              \
+        23,                              \
+        22,                              \
+        21,                              \
+        20,                              \
+        19,                              \
+        18,                              \
+        17,                              \
+        16,                              \
+        15,                              \
+        14,                              \
+        13,                              \
+        12,                              \
+        11,                              \
+        10,                              \
+        9,                               \
+        8,                               \
+        7,                               \
+        6,                               \
+        5,                               \
+        4,                               \
+        3,                               \
+        2,                               \
+        1,                               \
+        0))
+#define _MEOJSON_ARG_COUNT1( \
+    _0,                      \
+    _1,                      \
+    _2,                      \
+    _3,                      \
+    _4,                      \
+    _5,                      \
+    _6,                      \
+    _7,                      \
+    _8,                      \
+    _9,                      \
+    _10,                     \
+    _11,                     \
+    _12,                     \
+    _13,                     \
+    _14,                     \
+    _15,                     \
+    _16,                     \
+    _17,                     \
+    _18,                     \
+    _19,                     \
+    _20,                     \
+    _21,                     \
+    _22,                     \
+    _23,                     \
+    _24,                     \
+    _25,                     \
+    _26,                     \
+    _27,                     \
+    _28,                     \
+    _29,                     \
+    _30,                     \
+    _31,                     \
+    _32,                     \
+    _33,                     \
+    _34,                     \
+    _35,                     \
+    _36,                     \
+    _37,                     \
+    _38,                     \
+    _39,                     \
+    _40,                     \
+    _41,                     \
+    _42,                     \
+    _43,                     \
+    _44,                     \
+    _45,                     \
+    _46,                     \
+    _47,                     \
+    _48,                     \
+    _49,                     \
+    _50,                     \
+    _51,                     \
+    _52,                     \
+    _53,                     \
+    _54,                     \
+    _55,                     \
+    _56,                     \
+    _57,                     \
+    _58,                     \
+    _59,                     \
+    _60,                     \
+    _61,                     \
+    _62,                     \
+    _63,                     \
+    _64,                     \
+    N,                       \
+    ...)                     \
     N
 
-#define _MEOJSON_FOR_EACH_(N, pred, ...) _MEOJSON_EXPAND(_MEOJSON_CONCATENATE(_MEOJSON_FOR_EACH_, N)(pred, __VA_ARGS__))
+#define _MEOJSON_FOR_EACH_(N, pred, ...) \
+    _MEOJSON_EXPAND(_MEOJSON_CONCATENATE(_MEOJSON_FOR_EACH_, N)(pred, __VA_ARGS__))
 #define _MEOJSON_FOR_EACH(pred, ...) \
-    _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_(_MEOJSON_EXPAND(_MEOJSON_ARG_COUNT(__VA_ARGS__)), pred, __VA_ARGS__))
+    _MEOJSON_EXPAND(                 \
+        _MEOJSON_FOR_EACH_(_MEOJSON_EXPAND(_MEOJSON_ARG_COUNT(__VA_ARGS__)), pred, __VA_ARGS__))
 
 #define _MEOJSON_VARNAME(x) _MEOJSON_CONCATENATE(_meojson_jsonization_, x)
 #define _MEOJSON_KEY_VALUE(x) _MEOJSON_STRINGIZE(x), x,
 } // namespace json::_private_macro
 
-#define MEO_TOJSON(...)                                                                                    \
-    json::value to_json() const                                                                            \
-    {                                                                                                      \
-        return json::_jsonization_helper::dumper()._to_json(_MEOJSON_EXPAND(                               \
-            _MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) json::_jsonization_helper::va_arg_end {}); \
+#define MEO_TOJSON(...)                                                         \
+    json::value to_json() const                                                 \
+    {                                                                           \
+        json::object result;                                                    \
+        json::_jsonization_helper::dumper()._to_json(                           \
+            result,                                                             \
+            _MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
+                json::_jsonization_helper::va_arg_end {});                      \
+        return result;                                                          \
     }
 
-#define MEO_CHECKJSON(...)                                                                                   \
-    bool check_json(const json::value& _MEOJSON_VARNAME(in)) const                                           \
-    {                                                                                                        \
-        std::string _MEOJSON_VARNAME(error_key);                                                             \
-        return check_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key));                                \
-    }                                                                                                        \
-    bool check_json(const json::value& _MEOJSON_VARNAME(in), std::string& _MEOJSON_VARNAME(error_key)) const \
-    {                                                                                                        \
-        return json::_jsonization_helper::checker()._check_json(                                             \
-            _MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key),                                               \
-            _MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__))                              \
-                json::_jsonization_helper::va_arg_end {});                                                   \
+#define MEO_CHECKJSON(...)                                                      \
+    bool check_json(const json::value& _MEOJSON_VARNAME(in)) const              \
+    {                                                                           \
+        std::string _MEOJSON_VARNAME(error_key);                                \
+        return check_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key));   \
+    }                                                                           \
+    bool check_json(                                                            \
+        const json::value& _MEOJSON_VARNAME(in),                                \
+        std::string& _MEOJSON_VARNAME(error_key)) const                         \
+    {                                                                           \
+        return json::_jsonization_helper::checker()._check_json(                \
+            _MEOJSON_VARNAME(in),                                               \
+            _MEOJSON_VARNAME(error_key),                                        \
+            _MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
+                json::_jsonization_helper::va_arg_end {});                      \
     }
 
-#define MEO_FROMJSON(...)                                                                             \
-    bool from_json(const json::value& _MEOJSON_VARNAME(in))                                           \
-    {                                                                                                 \
-        std::string _MEOJSON_VARNAME(error_key);                                                      \
-        return from_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key));                          \
-    }                                                                                                 \
-    bool from_json(const json::value& _MEOJSON_VARNAME(in), std::string& _MEOJSON_VARNAME(error_key)) \
-    {                                                                                                 \
-        return json::_jsonization_helper::loader()._from_json(                                        \
-            _MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key),                                        \
-            _MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__))                       \
-                json::_jsonization_helper::va_arg_end {});                                            \
+#define MEO_FROMJSON(...)                                                       \
+    bool from_json(const json::value& _MEOJSON_VARNAME(in))                     \
+    {                                                                           \
+        std::string _MEOJSON_VARNAME(error_key);                                \
+        return from_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key));    \
+    }                                                                           \
+    bool from_json(                                                             \
+        const json::value& _MEOJSON_VARNAME(in),                                \
+        std::string& _MEOJSON_VARNAME(error_key))                               \
+    {                                                                           \
+        return json::_jsonization_helper::loader()._from_json(                  \
+            _MEOJSON_VARNAME(in),                                               \
+            _MEOJSON_VARNAME(error_key),                                        \
+            _MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
+                json::_jsonization_helper::va_arg_end {});                      \
     }
 
 #define MEO_JSONIZATION(...)                    \
@@ -235,6 +641,7 @@ namespace json::_private_macro
     _MEOJSON_EXPAND(MEO_FROMJSON(__VA_ARGS__))
 
 #define MEO_OPT json::_jsonization_helper::next_is_optional_t {},
+#define MEO_KEY(key) json::_jsonization_helper::next_override_key_t { key },
 
 #if defined(__clang__)
 #pragma clang diagnostic pop // -Wgnu-zero-variadic-macro-arguments

CHANGELOG.md

@@ -1,59 +1,49 @@
-## v5.15.0-beta.1
+## v5.26.0-beta.1
 
 ### 新增 | New
 
-* 添加控件半透明背景色，新增自定义背景 (#12204) @ABA2396 @status102
-* YoStarEN Sarkaz theme + JP and KR template optimization @Constrat
-* 新增 MirrorChyan ErrorCode 提示 (#12202) @ABA2396
-* Telegram Topic notification (#12188) @Constrat
-* 任务列表支持多个开始唤醒，以实现多账号 (#12144) @hguandl
-* SSS#6 for EN (#12168) @dragonheart107
-* check nightly version with mirrorchyan (#12173) @MistEO
-* 调整下载来源提示 (#12156) @MistEO
-
-### 改进 | Improved
-
-* 孤星搓玉关 @Daydreamer114
-* 资源更新换一个解压目录 (#12153) @MistEO
-* 自动战斗开始前仅移除相似的召唤物头像缓存 @status102
+* 次生预案十里坡剑神 @ABA2396
+* 设置指引添加更新设置 @ABA2396
+* 设置指引添加性能设置 @ABA2396
 
 ### 修复 | Fix
 
-* CheckLevelMax ocr target "-" -> digits (#12223) @BxFS
-* handle leak @dantmnf
-* YostarKR lower StartToVisit templThreshold (#12193) @HX3N
-* 保全开始部署 点击过快导致点击无效 (#12185) @Daydreamer114
-* 自动战斗在开启战斗列表时导入作业后，关闭战斗列表开始任务时作业使用错误 @status102
-* SSS#6 directional EC and branches @Constrat
-* 控制中枢模板mask (#12177) @Daydreamer114
-* 繁中服_生息演算組裝道具後卡住 (#12182) @momomochi987 @Daydreamer114
-* xaml requires   @Constrat
-* 钼铅识别错误 @ABA2396
-* update version.json on Arknights-Tile-Pos changes fix 43c672df541bae77b484c2faeb23c4522230e3ca @Constrat
-* roguelike already left encounter check and return from map screen (#12088) @BxFS
+* 文档首页语言选择按钮的宽度定义方式 (#14199) @lucienshawls
+* 傀影肉鸽无法识别四结局 (#14193) @Saratoga-Official
+* GamePassSkip2 识别到错误的跳过 @Saratoga-Official
+* 萨米肉鸽不期而遇避战 @Saratoga-Official
+* Google Play Games Developer shutdown @Constrat
+* manual set resource version time @MistEO
+* prettier @Constrat
 
 ### 文档 | Docs
 
-* add space @MistEO
+* 补充vsc插件繁中文档 @Rbqwow
+* 修复文档站 readme 盾换行 @Rbqwow
+* 调整文档站的标题和尾注文本显示 (#14213) @lucienshawls
+* 更新网页开发相关文档 (#14167) @Rbqwow @Manicsteiner
+* 完善任务流程协议文档 (#13232) @zzyyyl
+* 回调消息协议文档视觉更新 @SherkeyXD
+* 集成文档视觉更新 @SherkeyXD
+* 文档启用 b 站视频播放功能 @SherkeyXD
+* 文档添加字段容器功能 @SherkeyXD
+* 文档添加功能 @SherkeyXD
+* 更新文档编写指南 @SherkeyXD
+* 标题 MAA 统一采用缩写 @MistEO
+* 再次调整文档站标题（ @MistEO
+* 调整文档站标题 @MistEO
+* Update JP(#14227) @wallsman
+* markdown pre-commit @zzyyyl
+* add extension's evaluating feature @neko-para
+* add telegram icon @SherkeyXD
 
 ### 其他 | Other
 
-* 繁中服「生路」活動導航 (#12224) @momomochi987
-* YostarKR Sarkaz Theme (#12220) @HX3N
-* gpu 选项禁用滚轮切换 @ABA2396
-* YostarJP Sarkaz Theme (#12216) @Manicsteiner
-* YostarJP 琳琅诗怀雅 ocr fix (#12219) @Manicsteiner
-* update wording about mirrorchyan (#12208) @MistEO
-* add delay pre UnlockClues @Constrat
-* YostarKR SSS#6 BuffChoose (#12191) @HX3N
-* update issue_template to remove new lines for EN @Constrat
-* 移除过时的重连代码 @ABA2396
-* tweak SSS files for global @Constrat
-* tweaked SSS copilot operators output @Constrat
-* add space after `:` @Constrat
-* YostarJP EnterInfrastDelicious (#12176) @Manicsteiner
-* 繁中服_聲浪安保派駐_定向導能元件 (#12174) @momomochi987
-* set output to UTF_8 for ResourceUpdater @Constrat
-* manual update version @MistEO
-* Revert "fix: roguelike already left encounter check and return from map screen (#12088)" @status102
-* Wpf肉鸽任务序列化 (#12124) @status102
+* 统一显示效果 @ABA2396
+* 水月萨米肉鸽不期而遇避战 @Saratoga-Official
+* 重写完成后动作仅一次的 ui 字符串 (#14196) @Rbqwow
+* 贸易站没其他好用的人再用锏 @ABA2396
+* YostarJP Sarkaz roguelike StageEncounter (#14223) @Manicsteiner
+* YostarJP sami roguelike 720p (#14210) @Manicsteiner
+* YostarJP Mizuki StageEncounter (#14206) @Manicsteiner
+* devcontainer.json (#14169) @Rbqwow @lucienshawls

CMakeLists.txt

@@ -1,194 +1,61 @@
-cmake_minimum_required(VERSION 3.21)
-project(MaaAssistantArknights)
+cmake_minimum_required(VERSION 3.28)
+project(MAA)
 
-if (NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
-endif ()
+endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 
-option(BUILD_TEST "build a demo" OFF)
+option(BUILD_WPF_GUI "build MaaWpfGui" ${WIN32})
+option(BUILD_DEBUG_DEMO "build debug demo" OFF)
 option(BUILD_XCFRAMEWORK "build xcframework for macOS app" OFF)
-option(BUILD_UNIVERSAL "build both arm64 and x86_64 on macOS" OFF)
+option(BUILD_SMOKE_TEST "build smoke_test" OFF)
 option(INSTALL_PYTHON "install python ffi" OFF)
 option(INSTALL_RESOURCE "install resource" OFF)
-option(INSTALL_DEVEL "install development files" OFF)
 option(INSTALL_FLATTEN "do not use bin lib include directory" ON)
-option(INSTALL_THIRD_LIBS "install third party libraries" ON)
-option(USE_MAADEPS "use third-party libraries built by MaaDeps" ON)
-option(USE_RANGE_V3 "use range-v3" OFF)
 option(WITH_EMULATOR_EXTRAS "build with emulator extras" ${WIN32})
-option(WITH_THRIFT "build with thrift" OFF)
-option(WITH_ASST_DEBUG "build with ASST_DEBUG defined" OFF)
+option(WITH_HASH_VERSION "generate version from git hash" OFF)
 
+include(${PROJECT_SOURCE_DIR}/MaaDeps/maadeps.cmake)
+
+include(${PROJECT_SOURCE_DIR}/cmake/config.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
-include(${PROJECT_SOURCE_DIR}/cmake/thrift-gen.cmake)
-
-if(USE_MAADEPS)
-    include(${PROJECT_SOURCE_DIR}/MaaDeps/maadeps.cmake)
-endif()
-
-add_library(header_only_libraries INTERFACE)
-target_include_directories(header_only_libraries INTERFACE 3rdparty/include 3rdparty/EmulatorExtras)
-
-file(GLOB_RECURSE maa_src src/MaaCore/*.cpp)
-
-add_library(MaaCore SHARED ${maa_src})
-
-if (MSVC)
-    target_compile_options(MaaCore PRIVATE "/utf-8")
-    target_compile_options(MaaCore PRIVATE "/MP")
-    target_compile_options(MaaCore PRIVATE "/W4;/WX")
-    target_compile_options(MaaCore PRIVATE "/wd4127")  # conditional expression is constant
-    target_compile_options(MaaCore PRIVATE "/Wv:19.35.32217")  # disable warning introduced after this version
-
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-else ()
-    target_compile_options(MaaCore PRIVATE "-Wall;-Wextra;-Wpedantic")
-    # LLVM clang 16 will failed with `error: no member named 'join' in namespace 'std::ranges::views'`, but Apple clang 16 won't
-    # value defined in https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
-    if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-        OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17))
-        target_compile_options(MaaCore PRIVATE "-fexperimental-library")
-    endif ()
-endif ()
-
-if (WIN32)
-    #注意：相比VS版本缺少了 -D_CONSOLE -D_WINDLL 两项
-    target_compile_definitions(MaaCore PRIVATE ASST_DLL_EXPORTS _UNICODE UNICODE)
-endif ()
-target_include_directories(MaaCore PUBLIC include PRIVATE src/MaaCore)
-set(MaaCore_PUBLIC_HEADERS include/AsstCaller.h include/AsstPort.h)
-target_sources(MaaCore PUBLIC ${MaaCore_PUBLIC_HEADERS})
-set_target_properties(MaaCore PROPERTIES
-    CXX_STANDARD 20
-    CXX_STANDARD_REQUIRED ON
-    PUBLIC_HEADER "${MaaCore_PUBLIC_HEADERS}"
-)
+include(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
 
 if(APPLE)
-    set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "@loader_path/")
-elseif(UNIX)
-    set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "$ORIGIN/")
-endif()
-
-if (BUILD_TEST)
-    add_executable(test src/Cpp/main.cpp)
-    set_target_properties(test PROPERTIES
-        CXX_STANDARD 20
-        CXX_STANDARD_REQUIRED ON
-    )
-    target_link_libraries(test MaaCore)
-endif (BUILD_TEST)
-
-find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs videoio)
-find_package(ZLIB REQUIRED)
-find_package(cpr CONFIG REQUIRED)
-
-list(APPEND maa_libs ${OpenCV_LIBS} ZLIB::ZLIB cpr::cpr header_only_libraries)
-
-if(USE_MAADEPS)
-    find_package(asio REQUIRED)
-    list(APPEND maa_libs asio::asio)
-endif()
-
-find_package(onnxruntime CONFIG REQUIRED) # provided by onnxruntime>=1.16
-list(APPEND maa_libs onnxruntime::onnxruntime)
-if(DEFINED fastdeploy_SOURCE_DIR)
-    # TODO: FetchContent github.com/MaaAssistantArknights/FastDeploy
-    if(NOT DEFINED fastdeploy_BINARY_DIR)
-        set(fastdeploy_BINARY_DIR ${CMAKE_BINARY_DIR}/fastdeploy)
-    endif()
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    add_subdirectory(${fastdeploy_SOURCE_DIR} ${fastdeploy_BINARY_DIR} EXCLUDE_FROM_ALL SYSTEM)
-    if(NOT DEFINED fastdeploy_INCLUDE_DIRS)
-        set(fastdeploy_INCLUDE_DIRS ${fastdeploy_SOURCE_DIR})
-    endif()
-    target_include_directories(MaaCore SYSTEM PRIVATE ${fastdeploy_INCLUDE_DIRS})
-    get_target_property(fastdeploy_type fastdeploy_ppocr TYPE)
-    if(fastdeploy_type STREQUAL "SHARED_LIBRARY")
-        install(TARGETS fastdeploy_ppocr)
-    endif()
-else()
-    find_package(fastdeploy_ppocr REQUIRED)
-endif()
-list(APPEND maa_libs fastdeploy_ppocr)
-
-target_link_libraries(MaaCore ${maa_libs})
-
-if(WITH_EMULATOR_EXTRAS AND NOT EXISTS ${PROJECT_SOURCE_DIR}/3rdparty/EmulatorExtras/Mumu)
-    message(WARNING "EmulatorExtras not found, please run `git submodule update --init 3rdparty/EmulatorExtras`")
-    set(WITH_EMULATOR_EXTRAS OFF)
-endif()
-target_compile_definitions(MaaCore PRIVATE ASST_WITH_EMULATOR_EXTRAS=$<BOOL:${WITH_EMULATOR_EXTRAS}>)
-
-if(WITH_THRIFT)
-    find_package(Thrift CONFIG REQUIRED)
-    add_subdirectory(src/MaaThriftController)
-    target_link_libraries(MaaCore MaaThriftController)
-endif(WITH_THRIFT)
-
-if (WITH_ASST_DEBUG)
-    target_compile_definitions(MaaCore PRIVATE ASST_DEBUG)
-endif ()
-
-if(WIN32)
-    target_link_libraries(MaaCore ws2_32)
-endif()
-
-if (USE_RANGE_V3)
-    target_compile_definitions(MaaCore PRIVATE ASST_USE_RANGES_RANGE_V3)
-    find_package(range-v3 REQUIRED)
-    target_link_libraries(MaaCore range-v3::range-v3)
-endif ()
-
-if(INSTALL_DEVEL)
-    set(MaaCore_install_extra_args PUBLIC_HEADER DESTINATION devel/include ARCHIVE DESTINATION devel/lib)
+    include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake)
 endif()
 
 if(INSTALL_FLATTEN)
     set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .)
 endif()
 
-install(TARGETS MaaCore ${MaaCore_install_flatten_args} ${MaaCore_install_extra_args})
+add_library(HeaderOnlyLibraries INTERFACE)
+target_include_directories(HeaderOnlyLibraries INTERFACE 3rdparty/include)
 
-if(INSTALL_THIRD_LIBS AND USE_MAADEPS)
-    maadeps_install()
+find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)
+find_package(Boost REQUIRED CONFIG COMPONENTS system)
+find_package(ZLIB REQUIRED)
+find_package(fastdeploy_ppocr REQUIRED)
+find_package(ONNXRuntime REQUIRED)
+
+add_subdirectory(src/MaaCore)
+
+if(BUILD_WPF_GUI)
+    include_external_msproject(MaaWpfGui ${PROJECT_SOURCE_DIR}/src/MaaWpfGui/MaaWpfGui.csproj)
+
+    add_dependencies(MaaWpfGui MaaCore)
 endif()
 
-if (INSTALL_PYTHON)
+if(INSTALL_PYTHON)
     install(DIRECTORY src/Python DESTINATION .)
-endif (INSTALL_PYTHON)
-if (INSTALL_RESOURCE)
+endif()
+
+if(INSTALL_RESOURCE)
     install(DIRECTORY resource DESTINATION .)
-endif (INSTALL_RESOURCE)
+endif()
 
-
-if (APPLE)
-    include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake)
-endif (APPLE)
-
-# define MAA_VERSION from git
-if (NOT DEFINED MAA_VERSION)
-    find_package(Git)
-endif ()
-if (NOT DEFINED MAA_VERSION AND GIT_FOUND)
-    execute_process(
-        COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-        RESULT_VARIABLE result
-        OUTPUT_VARIABLE output
-        ERROR_VARIABLE err
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if (result EQUAL 0)
-        set(MAA_VERSION "${output}")
-    else ()
-        message(WARNING "git rev-parse returning ${result}, output:\n${err}")
-    endif ()
-endif ()
-if (NOT MAA_VERSION)
-    set(MAA_VERSION "DEBUG VERSION")
-endif ()
-message(STATUS "MAA_VERSION=${MAA_VERSION}")
-add_compile_definitions(MAA_VERSION="${MAA_VERSION}")
+if(BUILD_DEBUG_DEMO OR BUILD_SMOKE_TEST)
+    add_subdirectory(src/Cpp)
+endif()

DependencySetup_依赖库安装.bat

@@ -1,18 +0,0 @@
-@echo off
-chcp 65001
-setlocal enabledelayedexpansion
-
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    echo 正在获取管理员权限...
-    echo Obtaining administrator privileges...
-    powershell -Command "Start-Process cmd.exe -ArgumentList '/c %~dpnx0' -Verb RunAs"
-    exit /b
-)
-
-winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
-winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
-
-echo 运行库修复完成，请重启电脑后再次尝试运行 MAA。
-echo The runtime library repair is complete. Please restart your computer and try running MAA again.
-pause

MAA.DotSettings

@@ -1,15 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Arknights/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Rougelike/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=templ/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=thres/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=vuvm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

MAA.sln

@@ -1,106 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32616.157
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaWpfGui", "src\MaaWpfGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300}
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaCore", "src\MaaCore\MaaCore.vcxproj", "{362D1E30-F5AE-4279-9985-65C27B3BA300}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaThriftController", "src\MaaThriftController\MaaThriftController.vcxproj", "{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{11F02235-5785-408B-9651-8A4B41FF36F4}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncRes", "src\SyncRes\SyncRes.csproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\Cpp\MaaSample.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}"
-	ProjectSection(ProjectDependencies) = postProject
-		{362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300}
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		RelWithDebInfo|ARM64 = RelWithDebInfo|ARM64
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.ActiveCfg = Debug|x64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.Build.0 = Debug|x64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.Build.0 = Release|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.Build.0 = Debug|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.ActiveCfg = Debug|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.Build.0 = Debug|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.ActiveCfg = Release|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.Build.0 = Release|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|x64.ActiveCfg = Debug|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|x64.Build.0 = Debug|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|ARM64.Build.0 = Release|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|x64.ActiveCfg = Release|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|x64.Build.0 = Release|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.ActiveCfg = Debug|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.Build.0 = Debug|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.Build.0 = Release|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.ActiveCfg = Release|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.Build.0 = Release|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.Build.0 = Debug|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.ActiveCfg = Debug|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.Build.0 = Debug|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.ActiveCfg = Release|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.Build.0 = Release|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4F2C0E4B-4FE9-47C6-A878-6BD2FAD8B9B2}
-	EndGlobalSection
-EndGlobal

MAA.sln.DotSettings

@@ -1,161 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SWMINIMIZE/@EntryIndexedValue">SWMINIMIZE</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP/@EntryIndexedValue">AP</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP_002D/@EntryIndexedValue">AP-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CA/@EntryIndexedValue">CA</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CA_002D/@EntryIndexedValue">CA-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CE/@EntryIndexedValue">CE</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CE_002D/@EntryIndexedValue">CE-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=IS/@EntryIndexedValue">IS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LD/@EntryIndexedValue">LD</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LS/@EntryIndexedValue">LS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LS_002D/@EntryIndexedValue">LS-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DA/@EntryIndexedValue">PR-A</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DA_002D/@EntryIndexedValue">PR-A-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DB/@EntryIndexedValue">PR-B</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DB_002D/@EntryIndexedValue">PR-B-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DC/@EntryIndexedValue">PR-C</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DC_002D/@EntryIndexedValue">PR-C-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DD/@EntryIndexedValue">PR-D</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DD_002D/@EntryIndexedValue">PR-D-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SK/@EntryIndexedValue">SK</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SK_002D/@EntryIndexedValue">SK-</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SSS/@EntryIndexedValue">SSS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=WSA/@EntryIndexedValue">WSA</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=XYAZ/@EntryIndexedValue">XYAZ</s:String>
-	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=Github/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acast/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acfend/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acguad/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acpion/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acspec/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=acsupo/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=advapi/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Aero/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Affero/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=aguard/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=amedic/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=amiya/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=apionr/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=arget/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Arknights/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=arkplanner/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=asnipe/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=autofill/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bluestacks/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=bsconsole/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ccast/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=cdfend/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=cguard/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Chyan/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=cmedic/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Collapsal/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=cpione/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=csnipe/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=cspec/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=csuppo/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ctrler/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=desp/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=dnplayer/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ehem/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=esource/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Favourite/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=filetime/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=findstr/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHW/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHWINFO/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=foldartal/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Foldartals/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=framerate/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=furni/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gacha/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gavial/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grandet/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hotkey/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Inited/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=iter/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=jsend/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ldconsole/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ldplayer/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=LD_0027s/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=leidian/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lolicon/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=lpwndpl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ls_005B_0022sub/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=luestacks/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=maatouch/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=memuc/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Minitouch/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=mirrorc/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mizuki/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mumu/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nemu/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Netease/@EntryIndexedValue">True</s:Boolean>
-	
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=netstat/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nonfriend/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=notstationed/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=objstr/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Originite/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Originium/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=originiums/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Orundum/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Orundums/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=o_FF9Fv_FF9F/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=pidl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=powrprof/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ppidl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Prts/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=pwfi/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=qmsg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raidian/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rcast/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rdfend/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=removelist/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rguard/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rmean/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rmedic/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Roguelike/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=rsnipe/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sami/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sarkaz/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Screencap/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=sctp/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=serilog/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Showminimized/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Shownormal/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Skland/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=specialaccess/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=spid/@EntryIndexedValue">True</s:Boolean>
-    <s:Boolean x:Key="/Default/UserDictionary/Words/=SSS/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=STGM/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stormeye/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=strlen/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stylet/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=subtask/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Suppressions/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=SWMINIMIZE/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=taskchain/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ucrtbase/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Yahei/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=yituliu/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Yostar/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=_0020_0020_0020wp_002ELength_0020/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=_0020_003D_0020stri/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

README.md

@@ -4,7 +4,7 @@
 
 <img alt="LOGO" src="./docs/.vuepress/public/images/maa-logo_512x512.png" width="256" height="256" />
 
-# MaaAssistantArknights
+# MAA
 
 <br>
 <div>
@@ -25,7 +25,7 @@
 
 <!-- markdownlint-restore -->
 
-[简体中文](https://maa.plus/docs/zh-cn/) | [繁體中文](https://maa.plus/docs/zh-tw/) | [English](https://maa.plus/docs/en-us/) | [日本語](https://maa.plus/docs/ja-jp/) | [한국어](https://maa.plus/docs/ko-kr/)
+[简体中文](https://docs.maa.plus/zh-cn/) | [繁體中文](https://docs.maa.plus/zh-tw/) | [English](https://docs.maa.plus/en-us/) | [日本語](https://docs.maa.plus/ja-jp/) | [한국어](https://docs.maa.plus/ko-kr/)
 
 MAA 的意思是 MAA Assistant Arknights
 
@@ -33,20 +33,20 @@ MAA 的意思是 MAA Assistant Arknights
 
 基于图像识别技术，一键完成全部日常任务！
 
-绝赞更新中  ✿✿ヽ(°▽°)ノ✿
+绝赞更新中 ✿✿ヽ(°▽°)ノ✿
 
 </div>
 
 ## 下载与安装
 
-请阅读 [文档](https://maa.plus/docs/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载，并参考 [新手上路](https://maa.plus/docs/zh-cn/manual/newbie.html) 进行安装。
+请阅读 [文档](https://docs.maa.plus/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载，并参考 [新手上路](https://docs.maa.plus/zh-cn/manual/newbie.html) 进行安装。
 
 ## 亮点功能
 
 - 刷理智，掉落识别及上传 [企鹅物流](https://penguin-stats.cn/)，[一图流](https://ark.yituliu.cn/)
-- 智能基建换班，自动计算干员效率，单设施内最优解；同时也支持 [自定义排班](https://maa.plus/docs/zh-cn/protocol/base-scheduling-schema.html)
+- 智能基建换班，自动计算干员效率，单设施内最优解；同时也支持 [自定义排班](https://docs.maa.plus/zh-cn/protocol/base-scheduling-schema.html)
 - 自动公招，可选使用加急许可，一次全部刷完！公招数据自动上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit)，[一图流](https://ark.yituliu.cn/survey/maarecruitdata)
-- 支持手动识别公招界面，方便对高星公招做出选择 ~~（你的这个高姿回费出的是推王呢还是推王呢）~~
+- 支持手动识别公招界面，方便对高星公招做出选择 ~~（你的这个高资回费出的是推王呢还是推王呢）~~
 - 支持识别干员列表，统计已有和未有干员及潜能，并在公招识别显示
 - 支持识别养成材料，并导出至 [企鹅物流刷图规划](https://penguin-stats.cn/planner)、[明日方舟工具箱](https://arkntools.app/#/material)、[ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)
 - 访问好友、收取信用及购物、领取日常奖励等，一键全日常自动长草
@@ -83,16 +83,16 @@ MAA 的意思是 MAA Assistant Arknights
 
 ### 功能介绍
 
-请参阅 [用户手册](https://maa.plus/docs/zh-cn/manual/)。
+请参阅 [用户手册](https://docs.maa.plus/zh-cn/manual/)。
 
 ### 外服支持
 
 目前国际服（美服）、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足，很多功能并没有进行全面的测试，所以请自行体验。  
-若您遇到了 Bug，或对某个功能有强需求，欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更；或加入我们一起建设 MAA！请参阅 [外服适配教程](https://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html)
+若您遇到了 Bug，或对某个功能有强需求，欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更；或加入我们一起建设 MAA！请参阅 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html)
 
 ### CLI 支持
 
-MAA 支持命令行界面（CLI）操作，支持 Linux，macOS 和 Windows，可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/)
+MAA 支持命令行界面（CLI）操作，支持 Linux，macOS 和 Windows，可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://docs.maa.plus/zh-cn/manual/cli/)
 
 ## 加入我们
 
@@ -103,26 +103,22 @@ MAA 支持命令行界面（CLI）操作，支持 Linux，macOS 和 Windows，
 - 全新框架：[MaaFramework](https://github.com/MaaXYZ/MaaFramework)
 - [作业站](https://prts.plus) 前端：[maa-copilot-frontend](https://github.com/MaaAssistantArknights/maa-copilot-frontend)
 - [作业站](https://prts.plus) 后端：[MaaBackendCenter](https://github.com/MaaAssistantArknights/MaaBackendCenter)
-- [官网](https://maa.plus)：[前端](website)
+- [官网](https://maa.plus)：[前端](https://github.com/MaaAssistantArknights/maa-website)
 - 深度学习：[MaaAI](https://github.com/MaaAssistantArknights/MaaAI)
 
 ### 多语言 (i18n)
 
-MAA 支持多国语言，并使用 Weblate 进行本地化管理。如果您通晓多门语言，欢迎前往 [MAA Weblate](https://weblate.maa-org.net) 帮助我们进行翻译。
-
 MAA 以中文（简体）为第一语言，翻译词条均以中文（简体）为准。
 
-[![Weblate](https://weblate.maa-org.net/widget/maa/wpf-gui/multi-auto.svg)](https://weblate.maa-org.net/engage/maa/)
-
 ### 参与开发
 
 #### Windows
 
-请参阅 [开始开发](https://maa.plus/docs/zh-cn/develop/development.html)。
+请参阅 [开始开发](https://docs.maa.plus/zh-cn/develop/development.html)。
 
 #### Linux | macOS
 
-请参阅 [Linux 编译教程](https://maa.plus/docs/zh-cn/develop/linux-tutorial.html)。
+请参阅 [Linux 编译教程](https://docs.maa.plus/zh-cn/develop/linux-tutorial.html)。
 
 #### API
 
@@ -135,22 +131,22 @@ MAA 以中文（简体）为第一语言，翻译词条均以中文（简体）
 - [Rust 接口](src/Rust/src/maa_sys)：[HTTP 接口](src/Rust)
 - [TypeScript 接口](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader)
 - [Woolang 接口](src/Woolang/maa.wo)：[集成示例](src/Woolang/demo.wo)
-- [集成文档](https://maa.plus/docs/zh-cn/protocol/integration.html)
-- [回调消息协议](https://maa.plus/docs/zh-cn/protocol/callback-schema.html)
-- [任务流程协议](https://maa.plus/docs/zh-cn/protocol/task-schema.html)
-- [自动抄作业协议](https://maa.plus/docs/zh-cn/protocol/copilot-schema.html)
+- [集成文档](https://docs.maa.plus/zh-cn/protocol/integration.html)
+- [回调消息协议](https://docs.maa.plus/zh-cn/protocol/callback-schema.html)
+- [任务流程协议](https://docs.maa.plus/zh-cn/protocol/task-schema.html)
+- [自动抄作业协议](https://docs.maa.plus/zh-cn/protocol/copilot-schema.html)
 
 #### 外服适配
 
-请参阅 [外服适配教程](https://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html)，对于国服已支持的功能，绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
+请参阅 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html)，对于国服已支持的功能，绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
 
 #### 想参与开发，但不太会用 GitHub?
 
-[GitHub Pull Request 流程简述](https://maa.plus/docs/zh-cn/develop/development.html#github-pull-request-流程简述)
+[GitHub Pull Request 流程简述](https://docs.maa.plus/zh-cn/develop/development.html#github-pull-request-流程简述)
 
 #### Issue bot
 
-请参阅 [Issue Bot 使用方法](https://maa.plus/docs/zh-cn/develop/issue-bot-usage.html)
+请参阅 [Issue Bot 使用方法](https://docs.maa.plus/zh-cn/develop/issue-bot-usage.html)
 
 ## 致谢
 
@@ -192,7 +188,7 @@ MAA 以中文（简体）为第一语言，翻译词条均以中文（简体）
 
 ## 声明
 
-- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源。
+- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源，并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)。
 - 本软件 logo 并非使用 AGPL 3.0 协议开源，[耗毛](https://weibo.com/u/3251357314)、vie 两位画师及软件全体开发者保留所有权利。不得以 AGPL 3.0 协议已授权为由在未经授权的情况下使用本软件 logo，不得在未经授权的情况下将本软件 logo 用于任何商业用途。
 - 本软件开源、免费，仅供学习交流使用。若您遇到商家使用本软件进行代练并收费，可能是设备与时间等费用，产生的问题及后果与本软件无关。
 
@@ -202,13 +198,13 @@ MAA 以中文（简体）为第一语言，翻译词条均以中文（简体）
 
 ## 广告
 
-用户交流 QQ 群：[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)  
+用户交流 QQ 群：[MAA 使用 & 粥游交流 QQ 群](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)  
 Discord 服务器: [邀请链接](https://discord.gg/23DfZ9uA4V)  
 用户交流 TG 群：[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)  
 自动战斗 JSON 作业分享：[prts.plus](https://prts.plus)  
-Bilibili 直播间：[MrEO 直播间](https://live.bilibili.com/2808861) 直播敲代码 & [MAA-Official 直播间](https://live.bilibili.com/27548877) 游戏/杂谈  
+Bilibili 直播间：[MrEO 直播间](https://live.bilibili.com/2808861) 直播敲代码 & [MAA-Official 直播间](https://live.bilibili.com/27548877) 游戏/杂谈
 
 技术群（舟无关、禁水）：[内卷地狱！(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)  
-开发者群：[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)  
+开发者群：[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
 
 如果觉得软件对你有帮助，帮忙点个 Star 吧！~（网页最上方右上角的小星星），这就是对我们最大的支持了！

build.cmd

@@ -1,7 +0,0 @@
-:; set -eo pipefail
-:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
-:; ${SCRIPT_DIR}/build.sh "$@"
-:; exit $?
-
-@ECHO OFF
-powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*

build.ps1

@@ -1,69 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$BuildArguments
-)
-
-Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
-
-Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { Write-Error $_ -ErrorAction Continue; exit 1 }
-$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-$BuildProjectFile = "$PSScriptRoot\tools\MaaBuilder\MaaBuilder.csproj"
-$TempDirectory = "$PSScriptRoot\\.nuke\temp"
-
-$DotNetGlobalFile = "$PSScriptRoot\\global.json"
-$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
-$DotNetChannel = "Current"
-
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
-$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
-
-###########################################################################
-# EXECUTION
-###########################################################################
-
-function ExecSafe([scriptblock] $cmd) {
-    & $cmd
-    if ($LASTEXITCODE) { exit $LASTEXITCODE }
-}
-
-# If dotnet CLI is installed globally and it matches requested version, use for execution
-if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
-     $(dotnet --version) -and $LASTEXITCODE -eq 0) {
-    $env:DOTNET_EXE = (Get-Command "dotnet").Path
-}
-else {
-    # Download install script
-    $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
-    New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
-
-    # If global.json exists, load expected version
-    if (Test-Path $DotNetGlobalFile) {
-        $DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
-        if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
-            $DotNetVersion = $DotNetGlobal.sdk.version
-        }
-    }
-
-    # Install by channel or version
-    $DotNetDirectory = "$TempDirectory\dotnet-win"
-    if (!(Test-Path variable:DotNetVersion)) {
-        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
-    } else {
-        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
-    }
-    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
-}
-
-Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
-
-ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
-ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }

build.sh

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-bash --version 2>&1 | head -n 1
-
-set -eo pipefail
-SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-BUILD_PROJECT_FILE="$SCRIPT_DIR/tools/MaaBuilder/MaaBuilder.csproj"
-TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
-
-DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
-DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
-DOTNET_CHANNEL="Current"
-
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_MULTILEVEL_LOOKUP=0
-
-###########################################################################
-# EXECUTION
-###########################################################################
-
-function FirstJsonValue {
-    perl -nle 'print $1 if m{"'"$1"'": "([^"]+)",?}' <<< "${@:2}"
-}
-
-# If dotnet CLI is installed globally and it matches requested version, use for execution
-if [ -x "$(command -v dotnet)" ] && dotnet --version &>/dev/null; then
-    export DOTNET_EXE="$(command -v dotnet)"
-else
-    # Download install script
-    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
-    mkdir -p "$TEMP_DIRECTORY"
-    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
-    chmod +x "$DOTNET_INSTALL_FILE"
-
-    # If global.json exists, load expected version
-    if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
-        DOTNET_VERSION=$(FirstJsonValue "version" "$(cat "$DOTNET_GLOBAL_FILE")")
-        if [[ "$DOTNET_VERSION" == ""  ]]; then
-            unset DOTNET_VERSION
-        fi
-    fi
-
-    # Install by channel or version
-    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
-    if [[ -z ${DOTNET_VERSION+x} ]]; then
-        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
-    else
-        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
-    fi
-    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
-fi
-
-echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
-
-"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
-"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"

cmake/config.cmake

@@ -0,0 +1,83 @@
+set(debug_comp_defs "_DEBUG;ASST_DEBUG")
+add_compile_definitions("$<$<CONFIG:Debug>:${debug_comp_defs}>")
+
+if(APPLE)
+    set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path")
+    set(CMAKE_BUILD_RPATH "@loader_path;@executable_path")
+elseif(UNIX)
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
+    set(CMAKE_BUILD_RPATH "$ORIGIN")
+endif()
+
+if(MSVC)
+    add_compile_options("/utf-8")
+    add_compile_options("/MP")
+    add_compile_options("/W4;/WX;/Gy;/permissive-;/sdl")
+    add_compile_options("/wd4127") # conditional expression is constant
+    add_compile_options("/wd4251") # export dll with templates
+
+    add_compile_options("/DWINVER=0x0A00")
+    add_compile_options("/D_WIN32_WINNT=0x0A00")
+
+    # https://github.com/actions/runner-images/issues/10004 https://github.com/microsoft/STL/releases/tag/vs-2022-17.10
+    add_compile_definitions("_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+
+    set(release_link_options "/OPT:REF;/OPT:ICF")
+    add_link_options("$<$<CONFIG:Release>:${release_link_options}>")
+    SET(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
+    SET(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+else()
+    add_compile_options("-Wall;-Werror;-Wextra;-Wpedantic;-Wno-missing-field-initializers")
+
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
+        add_compile_options("-Wno-restrict")
+    endif()
+endif()
+
+if(LINUX)
+    function(copy_and_add_rpath_library LIBNAME)
+        execute_process(
+            COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=${LIBNAME}.so.1 -target ${CMAKE_CXX_COMPILER_TARGET} --sysroot=${CMAKE_SYSROOT}
+            OUTPUT_VARIABLE LIB_PATH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        if("${LIB_PATH}" STREQUAL "${LIBNAME}.so.1")
+            message(FATAL_ERROR "Could not locate ${LIBNAME}.so.1 using compiler")
+        endif()
+
+        file(READ_SYMLINK "${LIB_PATH}" LINK_TARGET)
+        if(NOT LINK_TARGET)
+            set(LIB_PATH_REAL "${LIB_PATH}")
+        elseif(NOT IS_ABSOLUTE "${LINK_TARGET}")
+            get_filename_component(LIB_PATH_DIR "${LIB_PATH}" DIRECTORY)
+            file(REAL_PATH "${LIB_PATH_DIR}/${LINK_TARGET}" LIB_PATH_REAL)
+        else()
+            set(LIB_PATH_REAL "${LINK_TARGET}")
+        endif()
+
+        if(NOT EXISTS "${LIB_PATH_REAL}")
+            message(FATAL_ERROR "File not found: ${LIB_PATH_REAL}")
+        endif()
+
+        message(STATUS "${LIBNAME}.so.1 path: ${LIB_PATH_REAL}")
+
+        install(FILES "${LIB_PATH_REAL}" DESTINATION . RENAME "${LIBNAME}.so.1" COMPONENT libcxx)
+
+        get_filename_component(LIB_PATH_DIR "${LIB_PATH_REAL}" DIRECTORY)
+        list(APPEND CMAKE_BUILD_RPATH "${LIB_PATH_DIR}")
+        set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" PARENT_SCOPE)
+    endfunction()
+
+    copy_and_add_rpath_library(libc++)
+    copy_and_add_rpath_library(libc++abi)
+    copy_and_add_rpath_library(libunwind)
+endif()
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

cmake/macos.cmake

@@ -25,6 +25,3 @@ if (BUILD_XCFRAMEWORK)
     )
 endif (BUILD_XCFRAMEWORK)
 
-target_compile_options(MaaCore PRIVATE
-    -Wno-deprecated-declarations
-    -Wno-gnu-zero-variadic-macro-arguments)

cmake/modules/FindONNXRuntime.cmake

@@ -0,0 +1,41 @@
+find_path(ONNXRuntime_INCLUDE_DIR NAMES onnxruntime/onnxruntime_c_api.h)
+
+find_library(ONNXRuntime_LIBRARY_IMP NAMES onnxruntime)
+
+if (WIN32)
+    get_filename_component(ONNXRuntime_PATH_LIB ${ONNXRuntime_LIBRARY_IMP} DIRECTORY)
+    find_file(ONNXRuntime_LIBRARY NAMES onnxruntime_maa.dll PATHS "${ONNXRuntime_PATH_LIB}/../bin")
+
+    find_file(ONNXRuntime_LIBRARY_IMP_DEBUG NAMES onnxruntime.lib PATHS "${ONNXRuntime_PATH_LIB}/../debug/lib")
+    find_file(ONNXRuntime_LIBRARY_DEBUG NAMES onnxruntime_maa.dll PATHS "${ONNXRuntime_PATH_LIB}/../debug/bin")
+else ()
+    set(ONNXRuntime_LIBRARY ${ONNXRuntime_LIBRARY_IMP})
+endif (WIN32)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    ONNXRuntime
+    REQUIRED_VARS ONNXRuntime_LIBRARY_IMP ONNXRuntime_INCLUDE_DIR
+)
+
+if(ONNXRuntime_FOUND)
+    set(ONNXRuntime_INCLUDE_DIRS ${ONNXRuntime_INCLUDE_DIR})
+    if(NOT TARGET ONNXRuntime::ONNXRuntime)
+        add_library(ONNXRuntime::ONNXRuntime SHARED IMPORTED)
+        set_property(TARGET ONNXRuntime::ONNXRuntime APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+        if (WIN32)
+            set_property(TARGET ONNXRuntime::ONNXRuntime APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
+                IMPORTED_IMPLIB_RELEASE "${ONNXRuntime_LIBRARY_IMP}"
+            )
+            set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
+                IMPORTED_IMPLIB_DEBUG "${ONNXRuntime_LIBRARY_IMP_DEBUG}"
+                IMPORTED_LOCATION_DEBUG "${ONNXRuntime_LIBRARY_DEBUG}"
+            )
+        endif (WIN32)
+        set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${ONNXRuntime_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${ONNXRuntime_INCLUDE_DIR}"
+        )
+    endif()
+endif()

cmake/opencv.cmake

@@ -1,54 +0,0 @@
-
-
-set(OPENCV_URL_PREFIX "https://github.com/MaaAssistantArknights/build-opencv/releases/download")
-
-set(OPENCV_TAG "4.5.3")
-
-set(COMPRESSED_SUFFIX ".tar.gz")
-
-if(WIN32)
-    set(OPENCV_FILENAME "OpenCV-Windows")
-    set(OPENCV_CHECKSUM "bf736b243bbdaa020f139e4dfa1e4f15633f4ce7a8ad885524645e660de47a8b")
-elseif(APPLE)
-    if (CURRENT_OSX_ARCH STREQUAL "arm64")
-        set(OPENCV_FILENAME "OpenCV-macOS-arm64")
-        set(OPENCV_CHECKSUM "31beb633c033dd4ee789ffa50911c29c9580860f9a91f334f03d8aa9c85e9700")
-    else()
-        set(OPENCV_FILENAME "OpenCV-macOS-x86_64")
-        set(OPENCV_CHECKSUM "249c5c97cc52257b68d35acf499b1cf1037f5e6f3b40752f82ad5abe7884bea9")
-    endif()
-else(UNIX)
-    set(OPENCV_FILENAME "OpenCV-Linux")
-    set(OPENCV_CHECKSUM "edc4138456189c9e8bdf29114ad2be8ec152e8e31087d98e633f6cda59b141ea")
-endif(WIN32)
-
-set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_TAG}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX})
-
-if(OPENCV_DIRECTORY)
-    set(OpenCV_DIR ${OPENCV_DIRECTORY})
-    find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR})
-    include_directories(${OpenCV_INCLUDE_DIRS})
-    list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
-else()
-    download_and_decompress(${OPENCV_URL}
-                        ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX}
-                        ${OPENCV_CHECKSUM}
-                        ${THIRD_PARTY_PATH}/install/)
-    set(OPENCV_FILENAME opencv)
-    set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME})
-    set(OPENCV_DIRECTORY ${OpenCV_DIR})
-    if (WIN32)
-        set(OpenCV_DIR ${OpenCV_DIR}/lib)
-    endif()
-    find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR} NO_DEFAULT_PATH)
-    include_directories(${OpenCV_INCLUDE_DIRS})
-    list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
-endif(OPENCV_DIRECTORY)
-
-if (INSTALL_THIRD_LIBS)
-    if (OpenCV_SHARED)
-        install(DIRECTORY ${OpenCV_INSTALL_PATH}/lib/
-                DESTINATION .
-                USE_SOURCE_PERMISSIONS PATTERN "cmake" EXCLUDE)
-    endif (OpenCV_SHARED)
-endif (INSTALL_THIRD_LIBS)

cmake/thrift-gen.cmake

@@ -1,44 +0,0 @@
-macro(GENERATE_THRIFT_LIB LIB_NAME FILENAME OUTPUTDIR SOURCES)
-    file(MAKE_DIRECTORY ${OUTPUTDIR})
-    detect_host_triplet(HOST_TRIPLET)
-    if (CMAKE_CROSSCOMPILING)
-      if (CMAKE_HOST_WIN32)
-        set(_host_executable_suffix ".exe")
-      else()
-        set(_host_executable_suffix "")
-      endif()
-    else()
-      set(_host_executable_suffix ${CMAKE_EXECUTABLE_SUFFIX})
-    endif()
-    if(EXISTS ${PROJECT_SOURCE_DIR}/MaaDeps/vcpkg/installed/maa-${HOST_TRIPLET}/tools/thrift/thrift${_host_executable_suffix})
-        set(THRIFT_COMPILER ${PROJECT_SOURCE_DIR}/MaaDeps/vcpkg/installed/maa-${HOST_TRIPLET}/tools/thrift/thrift${_host_executable_suffix})
-    else()
-        find_program(THRIFT_COMPILER thrift)
-    endif()
-    if(NOT THRIFT_COMPILER)
-        message(FATAL_ERROR "Thrift compiler not found")
-    endif()
-    get_filename_component(THRIFT_IDL_NAME ${FILENAME} NAME_WE)
-    set(THRIFT_IDL_TARGET "${LIB_NAME}_${THRIFT_IDL_NAME}_idl")
-    set("${THRIFT_IDL_NAME}-gen-cpp"
-        ${OUTPUTDIR}/${THRIFT_IDL_NAME}.cpp
-        ${OUTPUTDIR}/${THRIFT_IDL_NAME}.h
-        ${OUTPUTDIR}/${THRIFT_IDL_NAME}_types.cpp
-        ${OUTPUTDIR}/${THRIFT_IDL_NAME}_types.h)
-
-    add_custom_command(OUTPUT ${${THRIFT_IDL_NAME}-gen-cpp}
-                       DEPENDS ${FILENAME}
-                       COMMAND ${THRIFT_COMPILER} --gen cpp:no_skeleton -out ${OUTPUTDIR} ${FILENAME}
-                       VERBATIM)
-    add_custom_target(${THRIFT_IDL_TARGET} DEPENDS ${${THRIFT_IDL_NAME}-gen-cpp})
-    add_library(${LIB_NAME} STATIC ${${THRIFT_IDL_NAME}-gen-cpp})
-    add_dependencies(${LIB_NAME} ${THRIFT_IDL_TARGET})
-    set_target_properties(${LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(${LIB_NAME} PUBLIC thrift::thrift)
-    target_include_directories(${LIB_NAME} PUBLIC ${OUTPUTDIR})
-    set(${SOURCES} ${${SOURCES}} ${GENERATED_SOURCES} PARENT_SCOPE)
-endmacro(GENERATE_THRIFT_LIB)
-
-if (WITH_THRIFT)
-    add_compile_definitions(WITH_THRIFT)
-endif (WITH_THRIFT)

cmake/utils.cmake

@@ -1,50 +1,73 @@
 function(download_and_decompress url filename sha256_checksum decompress_dir)
-  if(EXISTS ${filename})
-    file(SHA256 ${filename} CHECKSUM_VARIABLE)
-  endif()
-  if(NOT EXISTS ${filename} OR NOT CHECKSUM_VARIABLE STREQUAL sha256_checksum)
-    message("Downloading file from ${url} to ${filename} ...")
-    file(DOWNLOAD ${url} "${filename}.tmp" SHOW_PROGRESS EXPECTED_HASH SHA256=${sha256_checksum})
-    file(RENAME "${filename}.tmp" ${filename})
-  endif()
-  if(NOT EXISTS ${decompress_dir})
-    file(MAKE_DIRECTORY ${decompress_dir})
-  endif()
-  message("Decompress file ${filename} ...")
-  execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${filename} WORKING_DIRECTORY ${decompress_dir})
+    if(EXISTS ${filename})
+        file(SHA256 ${filename} CHECKSUM_VARIABLE)
+    endif()
+
+    if(NOT EXISTS ${filename} OR NOT CHECKSUM_VARIABLE STREQUAL sha256_checksum)
+        message("Downloading file from ${url} to ${filename} ...")
+        file(
+            DOWNLOAD ${url} "${filename}.tmp"
+            SHOW_PROGRESS
+            EXPECTED_HASH SHA256=${sha256_checksum})
+        file(RENAME "${filename}.tmp" ${filename})
+    endif()
+
+    if(NOT EXISTS ${decompress_dir})
+        file(MAKE_DIRECTORY ${decompress_dir})
+    endif()
+
+    message("Decompress file ${filename} ...")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${filename} WORKING_DIRECTORY ${decompress_dir})
 endfunction()
 
 function(get_osx_architecture)
-  if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-    set(CURRENT_OSX_ARCH "arm64" PARENT_SCOPE)
-  elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
-    set(CURRENT_OSX_ARCH "x86_64" PARENT_SCOPE)
-  else()
-    set(CURRENT_OSX_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR} PARENT_SCOPE)
-  endif()
+    if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+        set(CURRENT_OSX_ARCH
+            "arm64"
+            PARENT_SCOPE)
+    elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
+        set(CURRENT_OSX_ARCH
+            "x86_64"
+            PARENT_SCOPE)
+    else()
+        set(CURRENT_OSX_ARCH
+            ${CMAKE_HOST_SYSTEM_PROCESSOR}
+            PARENT_SCOPE)
+    endif()
 endfunction()
 
-function(detect_host_triplet outvar)
-  string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" host_triplet_system)
-  string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" host_triplet_arch)
-  if(host_triplet_system STREQUAL "darwin")
-    set(host_triplet_system "osx")
-  endif()
-  message("host_triplet_system: ${host_triplet_system}")
-  message("host_triplet_arch: ${host_triplet_arch}")
-  if(host_triplet_arch MATCHES "(amd64|x86_64)")
-    set(host_triplet_arch "x64")
-  elseif(host_triplet_arch MATCHES "i[3456]86")
-    set(host_triplet_arch "x86")
-  elseif(host_triplet_arch MATCHES "(aarch64|armv8l|arm64)")
-    set(host_triplet_arch "arm64")
-  else()
-    message(FATAL_ERROR "Unrecognized CMAKE_HOST_SYSTEM_PROCESSOR: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
-  endif()
-  set(${outvar} "${host_triplet_arch}-${host_triplet_system}" PARENT_SCOPE)
-endfunction()
+if(APPLE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3) # for to_chars
+    get_osx_architecture()
+endif(APPLE)
 
-if (APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
-  get_osx_architecture()
-endif (APPLE)
+if(NOT DEFINED MAADEPS_TRIPLET)
+    detect_maadeps_triplet(MAADEPS_TRIPLET)
+endif()
+
+# 创建资源目录链接的函数
+function(create_resource_link TARGET_NAME OUTPUT_DIR)
+    if(WIN32)
+        # Windows 使用 mklink /J 创建目录链接（不需要管理员权限）
+        add_custom_command(
+            TARGET ${TARGET_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
+            COMMAND ${CMAKE_COMMAND} -E remove_directory "${OUTPUT_DIR}/resource"
+            COMMAND cmd /c "mklink /J \"${OUTPUT_DIR}/resource\" \"${PROJECT_SOURCE_DIR}/resource\""
+            COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
+            COMMENT "Creating junction for resource directory for ${TARGET_NAME}"
+        )
+    else()
+        # Unix/Linux/macOS 使用符号链接
+        add_custom_command(
+            TARGET ${TARGET_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
+            COMMAND ${CMAKE_COMMAND} -E remove "${OUTPUT_DIR}/resource"
+            COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/resource" "${OUTPUT_DIR}/resource"
+            COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
+            COMMENT "Creating symlink for resource directory for ${TARGET_NAME}"
+        )
+    endif()
+endfunction()

cmake/version.cmake

@@ -0,0 +1,27 @@
+# define MAA_HASH_VERSION from git
+set(MAA_HASH_VERSION
+    "DEBUG_VERSION"
+    CACHE STRING "maa version")
+
+if(WITH_HASH_VERSION AND MAA_HASH_VERSION STREQUAL "DEBUG_VERSION")
+    find_package(Git)
+
+    if(GIT_FOUND)
+        execute_process(
+            COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            RESULT_VARIABLE result
+            OUTPUT_VARIABLE output
+            ERROR_VARIABLE err
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        if(result EQUAL 0)
+            set(MAA_HASH_VERSION "${output}")
+        else()
+            message(WARNING "git rev-parse returning ${result}, output:\n${err}")
+        endif()
+    endif()
+endif()
+
+message(STATUS "MAA_HASH_VERSION=${MAA_HASH_VERSION}")
+add_compile_definitions(MAA_VERSION="${MAA_HASH_VERSION}")

docs/.markdownlint.yaml

@@ -224,3 +224,38 @@ MD052: true
 MD053:
   # Ignored definitions
   ignored_definitions: ["//"]
+
+# MD054/link-image-style - Link and image style
+MD054:
+  # Allow autolinks
+  autolink: true
+  # Allow collapsed reference links and images
+  collapsed: true
+  # Allow full reference links and images
+  full: true
+  # Allow inline links and images
+  inline: true
+  # Allow shortcut reference links and images
+  shortcut: true
+  # Allow URLs as inline links
+  url_inline: true
+
+# MD055/table-pipe-style - Table pipe style
+MD055:
+  # Table pipe style
+  style: "consistent"
+
+# MD056/table-column-count - Table column count
+MD056: true
+
+# MD057 - Table column count inconsistencies with table header column count
+# (Not documented in official rules list - MD057 appears to be missing or deprecated)
+
+# MD058/blanks-around-tables - Tables should be surrounded by blank lines
+MD058: true
+
+# MD059/descriptive-link-text - Link text should be descriptive
+MD059:
+  false
+  # Prohibited link texts
+  #prohibited_texts: ["click here", "here", "link", "more"]

docs/.prettierignore

@@ -0,0 +1,2 @@
+**/pnpm-lock.yaml
+**/*.md

docs/.prettierrc.js

@@ -0,0 +1,40 @@
+module.exports = {
+  printWidth: 120,
+  tabWidth: 2,
+  useTabs: false,
+  bracketSpacing: true,
+  bracketSameLine: false,
+  endOfLine: 'auto',
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+  arrowParens: 'always',
+
+  overrides: [
+    {
+      files: ['**/*.ts'],
+      options: {
+        semi: true,
+      },
+    },
+    {
+      files: ['**/*.*css'],
+      options: {
+        singleQuote: false,
+      },
+    },
+    {
+      files: ['**/*.yml', '**/*.yaml'],
+      options: {
+        parser: 'yaml',
+        singleQuote: false,
+      },
+    },
+    {
+      files: ['**/*.json'],
+      options: {
+        tabWidth: 4,
+      },
+    },
+  ],
+}

docs/.vuepress/client.ts

@@ -1,12 +1,11 @@
-import { defineClientConfig } from "vuepress/client";
-import Image1 from "../components/Image1.vue";
-import Image2 from "../components/Image2.vue";
-import Image4 from "../components/Image4.vue";
+import { defineClientConfig } from 'vuepress/client';
+
+import ImageGrid from './components/ImageGrid.vue';
+
+import './styles/index.scss';
 
 export default defineClientConfig({
   enhance: ({ app }) => {
-    app.component("Image1", Image1);
-    app.component("Image2", Image2);
-    app.component("Image4", Image4);
+    app.component('ImageGrid', ImageGrid);
   },
 });

docs/.vuepress/components/ImageGrid.vue

@@ -0,0 +1,72 @@
+<template>
+  <CardGrid>
+    <ImageCard v-for="(item, index) of displayImageList" :key="index" :image="item" />
+  </CardGrid>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, computed, ref, onMounted, onUnmounted } from 'vue'
+import { withBase } from 'vuepress/client'
+
+export default defineComponent({
+  name: 'ImageCardGrid',
+  props: {
+    imageList: {
+      type: Array as PropType<Array<{ light: string; dark: string } | string>>,
+      required: true,
+    },
+  },
+  setup(props) {
+    const isDarkMode = ref(false)
+    let observer: MutationObserver | null = null
+    let mediaQuery: MediaQueryList | null = null
+
+    const updateDarkMode = () => {
+      if (typeof window !== 'undefined') {
+        const html = document.documentElement
+        isDarkMode.value =
+          html.classList.contains('dark') ||
+          html.getAttribute('data-theme') === 'dark' ||
+          window.matchMedia('(prefers-color-scheme: dark)').matches
+      }
+    }
+
+    onMounted(() => {
+      updateDarkMode()
+
+      if (typeof window !== 'undefined') {
+        // 监听DOM变化（主题切换通常会改变class或data-theme属性）
+        observer = new MutationObserver(updateDarkMode)
+        observer.observe(document.documentElement, {
+          attributes: true,
+          attributeFilter: ['class', 'data-theme'],
+        })
+
+        // 监听系统主题变化
+        mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
+        mediaQuery.addEventListener('change', updateDarkMode)
+      }
+    })
+
+    onUnmounted(() => {
+      if (observer) {
+        observer.disconnect()
+      }
+      if (mediaQuery) {
+        mediaQuery.removeEventListener('change', updateDarkMode)
+      }
+    })
+
+    const displayImageList = computed(() => {
+      return props.imageList.map((item) => {
+        const src = typeof item === 'string' ? item : isDarkMode.value ? item.dark : item.light
+        return withBase(src)
+      })
+    })
+
+    return {
+      displayImageList,
+    }
+  },
+})
+</script>

docs/.vuepress/config.ts

@@ -1,77 +1,70 @@
-import { defineUserConfig } from "vuepress";
-import { viteBundler } from "@vuepress/bundler-vite";
-import { googleAnalyticsPlugin } from "@vuepress/plugin-google-analytics";
-import Theme from "./theme";
+import { viteBundler } from '@vuepress/bundler-vite';
+import { defineUserConfig } from 'vuepress';
+import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics';
+import { plumeTheme } from 'vuepress-theme-plume';
+
+import DocSearchConfig from './plugins/search';
+
+const isProd = process.env.NODE_ENV === 'production';
 
 export default defineUserConfig({
-  base: "/docs/",
-  lang: "zh-CN",
-  title: "MaaAssistantArknights",
-  description: "MAA",
+  base: '/',
+  lang: 'zh-CN',
+  title: 'MAA 文档站',
+  description: 'MAA —「明日方舟」小助手',
+  host: '0.0.0.0',
   port: 3001,
 
   locales: {
-    "/zh-cn/": {
-      lang: "zh-CN",
-      description: "文档",
+    '/zh-cn/': {
+      lang: 'zh-CN',
+      title: 'MAA 文档站',
+      description: '文档',
     },
-    "/zh-tw/": {
-      lang: "zh-TW",
-      description: "文件",
+    '/zh-tw/': {
+      lang: 'zh-TW',
+      title: 'MAA 文件站',
+      description: '文件',
     },
-    "/en-us/": {
-      lang: "en-US",
-      description: "Documentation",
+    '/en-us/': {
+      lang: 'en-US',
+      title: 'MAA Documentation Site',
+      description: 'Documentation',
     },
-    "/ja-jp/": {
-      lang: "ja-JP",
-      description: "ドキュメンテーション",
+    '/ja-jp/': {
+      lang: 'ja-JP',
+      title: 'MAA ドキュメントサイト',
+      description: 'ドキュメント',
     },
-    "/ko-kr/": {
-      lang: "ko-KR",
-      description: "선적 서류 비치",
+    '/ko-kr/': {
+      lang: 'ko-KR',
+      title: 'MAA 문서 사이트',
+      description: '문서',
     },
   },
 
-  markdown: {
-    headers: {
-      level: [2, 3, 4, 5],
-    },
-  },
-
-  theme: Theme,
-
-  plugins: [
-    googleAnalyticsPlugin({
-      id: "G-FJQDKG394Z",
-    }),
-  ],
-
   head: [
-    ["link", { rel: "preconnect", href: "https://fonts.googleapis.com" }],
+    ['link', { rel: 'preconnect', href: 'https://fonts.googleapis.com' }],
+    ['link', { rel: 'preconnect', href: 'https://fonts.gstatic.com', crossorigin: '' }],
     [
-      "link",
-      { rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "" },
-    ],
-    [
-      "link",
+      'link',
       {
-        href: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100..900&display=swap",
-        rel: "stylesheet",
+        href: 'https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100..900&display=swap',
+        rel: 'stylesheet',
       },
     ],
     [
-      "link",
+      'link',
       {
-        href: "https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap",
-        rel: "stylesheet",
+        href: 'https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap',
+        rel: 'stylesheet',
       },
     ],
     [
-      "link",
+      'link',
       {
-        href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap",
-        rel: "stylesheet",
+        href: 'https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap',
+        rel: 'stylesheet',
       },
     ],
   ],
@@ -80,4 +73,63 @@ export default defineUserConfig({
     viteOptions: {},
     vuePluginOptions: {},
   }),
+
+  shouldPrefetch: false,
+
+  theme: plumeTheme({
+    hostname: 'https://docs.maa.plus',
+
+    docsRepo: 'MaaAssistantArknights/MaaAssistantArknights',
+    docsDir: '/docs',
+    docsBranch: 'dev',
+
+    editLink: true,
+    lastUpdated: false,
+    contributors: false,
+    changelog: false,
+
+    blog: false,
+
+    cache: 'filesystem',
+
+    search: DocSearchConfig,
+
+    codeHighlighter: {
+      themes: { light: 'one-light', dark: 'one-dark-pro' },
+    },
+
+    markdown: {
+      image: {
+        lazyload: true,
+        mark: true,
+        size: true,
+      },
+
+      icon: { provider: 'iconify' },
+      plot: true,
+      field: true,
+      bilibili: true,
+    },
+
+    watermark: false,
+
+    comment: {
+      provider: 'Giscus',
+      repo: 'MaaAssistantArknights/maa-website',
+      repoId: 'R_kgDOHY7Gyg',
+      category: 'Comments',
+      categoryId: 'DIC_kwDOHY7Gys4CgoVH',
+      mapping: 'pathname',
+      strict: false,
+      lazyLoading: true,
+    },
+
+    //replaceAssets: isProd ? "https://cdn.maa.plus" : false,
+  }),
+
+  plugins: [
+    googleAnalyticsPlugin({
+      id: 'G-FJQDKG394Z',
+    }),
+  ],
 });

docs/.vuepress/env.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { DefineComponent } from 'vue';
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
+}

docs/.vuepress/navbar/en-us.ts

@@ -1,29 +1,19 @@
-import { navbar } from "vuepress-theme-hope";
+import { defineNavbarConfig } from 'vuepress-theme-plume';
 
-export const enusNavbar = navbar([
+export const enusNavbar = defineNavbarConfig([
   {
-    text: "Home",
-    icon: "ic:round-home",
-    link: "/en-us/",
+    text: 'User Manual',
+    icon: 'mdi:user',
+    link: '/en-us/manual/newbie.html',
   },
   {
-    text: "User Manual",
-    icon: "mdi:user",
-    link: "/en-us/manual/",
+    text: 'Development Docs',
+    icon: 'ph:code-bold',
+    link: '/en-us/develop/development.html',
   },
   {
-    text: "Development Docs",
-    icon: "ph:code-bold",
-    link: "/en-us/develop/",
-  },
-  {
-    text: "Protocol Docs",
-    icon: "basil:document-solid",
-    link: "/en-us/protocol/",
-  },
-  {
-    text: "MAA Website",
-    icon: "mdi:cow",
-    link: "https://maa.plus",
+    text: 'Protocol Docs',
+    icon: 'basil:document-solid',
+    link: '/en-us/protocol/integration.html',
   },
 ]);

docs/.vuepress/navbar/index.ts

@@ -1,5 +1,5 @@
-export * from "./zh-cn";
-export * from "./zh-tw";
-export * from "./en-us";
-export * from "./ja-jp";
-export * from "./ko-kr";
+export * from './zh-cn';
+export * from './zh-tw';
+export * from './en-us';
+export * from './ja-jp';
+export * from './ko-kr';

docs/.vuepress/navbar/ja-jp.ts

@@ -1,29 +1,19 @@
-import { navbar } from "vuepress-theme-hope";
+import { defineNavbarConfig } from 'vuepress-theme-plume';
 
-export const jajpNavbar = navbar([
+export const jajpNavbar = defineNavbarConfig([
   {
-    text: "ホームページ",
-    icon: "ic:round-home",
-    link: "/ja-jp/",
+    text: '使用説明',
+    icon: 'mdi:user',
+    link: '/ja-jp/manual/newbie.html',
   },
   {
-    text: "使用説明",
-    icon: "mdi:user",
-    link: "/ja-jp/manual/",
+    text: '開発関連',
+    icon: 'ph:code-bold',
+    link: '/ja-jp/develop/development.html',
   },
   {
-    text: "開発関連",
-    icon: "ph:code-bold",
-    link: "/ja-jp/develop/",
-  },
-  {
-    text: "プロトコルドキュメント",
-    icon: "basil:document-solid",
-    link: "/ja-jp/protocol/",
-  },
-  {
-    text: "MAA 公式サイト",
-    icon: "mdi:cow",
-    link: "https://maa.plus",
+    text: 'プロトコルドキュメント',
+    icon: 'basil:document-solid',
+    link: '/ja-jp/protocol/integration.html',
   },
 ]);

docs/.vuepress/navbar/ko-kr.ts

@@ -1,29 +1,19 @@
-import { navbar } from "vuepress-theme-hope";
+import { defineNavbarConfig } from 'vuepress-theme-plume';
 
-export const kokrNavbar = navbar([
+export const kokrNavbar = defineNavbarConfig([
   {
-    text: "홈페이지",
-    icon: "ic:round-home",
-    link: "/ko-kr/",
+    text: '사용자 설명서',
+    icon: 'mdi:user',
+    link: '/ko-kr/manual/newbie.html',
   },
   {
-    text: "사용자 설명서",
-    icon: "mdi:user",
-    link: "/ko-kr/manual/",
+    text: '개발 문서',
+    icon: 'ph:code-bold',
+    link: '/ko-kr/develop/development.html',
   },
   {
-    text: "개발 문서",
-    icon: "ph:code-bold",
-    link: "/ko-kr/develop/",
-  },
-  {
-    text: "프로토콜 문서",
-    icon: "basil:document-solid",
-    link: "/ko-kr/protocol/",
-  },
-  {
-    text: "MAA 공식 홈페이지",
-    icon: "mdi:cow",
-    link: "https://maa.plus",
+    text: '프로토콜 문서',
+    icon: 'basil:document-solid',
+    link: '/ko-kr/protocol/integration.html',
   },
 ]);

docs/.vuepress/navbar/zh-cn.ts

@@ -1,29 +1,19 @@
-import { navbar } from "vuepress-theme-hope";
+import { defineNavbarConfig } from 'vuepress-theme-plume';
 
-export const zhcnNavbar = navbar([
+export const zhcnNavbar = defineNavbarConfig([
   {
-    text: "主页",
-    icon: "ic:round-home",
-    link: "/zh-cn/",
+    text: '用户手册',
+    icon: 'mdi:user',
+    link: '/zh-cn/manual/newbie.html',
   },
   {
-    text: "用户手册",
-    icon: "mdi:user",
-    link: "/zh-cn/manual/",
+    text: '开发文档',
+    icon: 'ph:code-bold',
+    link: '/zh-cn/develop/development.html',
   },
   {
-    text: "开发文档",
-    icon: "ph:code-bold",
-    link: "/zh-cn/develop/",
-  },
-  {
-    text: "协议文档",
-    icon: "basil:document-solid",
-    link: "/zh-cn/protocol/",
-  },
-  {
-    text: "MAA 官网",
-    icon: "mdi:cow",
-    link: "https://maa.plus",
+    text: '协议文档',
+    icon: 'basil:document-solid',
+    link: '/zh-cn/protocol/integration.html',
   },
 ]);

docs/.vuepress/navbar/zh-tw.ts

@@ -1,29 +1,19 @@
-import { navbar } from "vuepress-theme-hope";
+import { defineNavbarConfig } from 'vuepress-theme-plume';
 
-export const zhtwNavbar = navbar([
+export const zhtwNavbar = defineNavbarConfig([
   {
-    text: "首頁",
-    icon: "ic:round-home",
-    link: "/zh-tw/",
+    text: '用戶說明書',
+    icon: 'mdi:user',
+    link: '/zh-tw/manual/newbie.html',
   },
   {
-    text: "用戶說明書",
-    icon: "mdi:user",
-    link: "/zh-tw/manual/",
+    text: '開發文件',
+    icon: 'ph:code-bold',
+    link: '/zh-tw/develop/development.html',
   },
   {
-    text: "開發文件",
-    icon: "ph:code-bold",
-    link: "/zh-tw/develop/",
-  },
-  {
-    text: "協議文件",
-    icon: "basil:document-solid",
-    link: "/zh-tw/protocol/",
-  },
-  {
-    text: "MAA 官網",
-    icon: "mdi:cow",
-    link: "https://maa.plus",
+    text: '協議文件',
+    icon: 'basil:document-solid',
+    link: '/zh-tw/protocol/integration.html',
   },
 ]);

docs/.vuepress/notes/en-us.ts

@@ -0,0 +1,8 @@
+import { defineNotesConfig } from 'vuepress-theme-plume';
+import { genNotes } from './genSidebar';
+
+export const enusNotes = defineNotesConfig({
+  dir: 'en-us',
+  link: '/en-us/',
+  notes: genNotes('en-us'),
+});

docs/.vuepress/notes/genSidebar.ts

@@ -0,0 +1,119 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as matterModule from 'gray-matter';
+import { defineNoteConfig, ThemeNote, ThemeSidebarItem } from 'vuepress-theme-plume';
+
+const matter = (matterModule as any).default;
+
+interface MetaData {
+  baseName: string;
+  order: number;
+  title: string;
+  icon: string;
+  index: boolean;
+}
+
+function getMetaData(dir: string, entry: fs.Dirent): MetaData | null {
+  const currentPath = path.join(dir, entry.name);
+  if (!fs.existsSync(currentPath)) {
+    return null;
+  }
+
+  let mdFilePath = '';
+  if (entry.isDirectory()) {
+    mdFilePath = path.join(currentPath, 'README.md');
+  } else if (entry.isFile() && entry.name.endsWith('.md') && entry.name.toLowerCase() !== 'readme.md') {
+    mdFilePath = currentPath;
+  } else {
+    return null;
+  }
+
+  if (!fs.existsSync(mdFilePath)) {
+    return null;
+  }
+
+  const fileContent = fs.readFileSync(mdFilePath, 'utf-8');
+  const meta = matter(fileContent).data ?? {};
+
+  const baseName = path.parse(entry.name).name;
+  // 获取顺序，目录的order在meta.dir.order里，文件的order在meta.order里，默认值为一个大数
+  const order = Number((entry.isDirectory() ? meta?.dir?.order : meta?.order) ?? Number.MAX_SAFE_INTEGER);
+  // 获取标题，先从matter里找title，再用正则获取一级标题，最后fallback到文件名（不含扩展名）
+  const title = String(meta?.title ?? RegExp('# (.+)').exec(fileContent)?.[1] ?? baseName);
+  // 获取图标
+  const icon = String(meta?.icon ?? '');
+  // 是否作为索引页，文件永远为true，目录则看meta.index，默认true
+  const index = entry.isDirectory() ? (Boolean(meta?.index) ?? true) : true;
+
+  return {
+    baseName: baseName,
+    order: order,
+    title: title,
+    icon: icon,
+    index: index,
+  };
+}
+
+export function genNotes(lang: string, baseDir = path.resolve(__dirname, '../../')): ThemeNote[] {
+  // 进入指定语言目录，即docs/<i18n>/
+  const langDir = path.join(baseDir, lang);
+
+  // 递归获取目录和文件
+  function getItems(dir: string, isRoot: boolean): any[] {
+    // 将内容与对应顺序进行包装
+    interface Wrapped {
+      content: ThemeNote | ThemeSidebarItem | string;
+      order: number;
+    }
+    let itemsWithOrder: Wrapped[] = [];
+
+    // 获取所有非隐藏文件和目录
+    const entries = fs.readdirSync(dir, { withFileTypes: true }).filter((e) => !e.name.startsWith('.'));
+
+    for (const entry of entries) {
+      const metaData = getMetaData(dir, entry);
+      if (!metaData) {
+        continue;
+      }
+      if (entry.isDirectory()) {
+        // 递归获取子目录内容
+        const children = getItems(path.join(dir, entry.name), false);
+
+        if (isRoot) {
+          // 一级目录，作为“专题”
+          const item = defineNoteConfig({
+            dir: metaData.baseName,
+            link: `/${metaData.baseName}/`,
+            text: metaData.title,
+            sidebar: children,
+          });
+          itemsWithOrder.push({ content: item, order: metaData.order });
+        } else {
+          // 非一级目录，作为可折叠的子目录
+          const item: ThemeSidebarItem = {
+            text: metaData.title,
+            // 只有当目录设置了index: true时，才生成链接，否则点击时不跳转、只切换折叠状态
+            link: metaData.index ? `${metaData.baseName}/` : undefined,
+            icon: metaData.icon,
+            // 目前没有文档使用了这个特性，故不处理
+            // badge: undefined,
+            collapsed: true,
+            // 前面不能加斜杠，必须用相对路径
+            prefix: `${metaData.baseName}/`,
+            items: children,
+          };
+          itemsWithOrder.push({ content: item, order: metaData.order });
+        }
+      } else if (entry.isFile() && entry.name.endsWith('.md') && entry.name.toLowerCase() !== 'readme.md') {
+        // 普通文件，取完整文件名作为链接
+        const item = entry.name;
+        itemsWithOrder.push({ content: item, order: metaData.order });
+      }
+    }
+    // 当前dir的内容读取完毕，进行排序并返回，返回时丢弃order
+    itemsWithOrder.sort((a, b) => a.order - b.order);
+    return itemsWithOrder.map((i) => i.content);
+  }
+  // 递归起点，只有这里是一级目录，isRoot传true
+  return getItems(langDir, true);
+}

docs/.vuepress/notes/index.ts

@@ -0,0 +1,5 @@
+export * from './zh-cn';
+export * from './zh-tw';
+export * from './en-us';
+export * from './ja-jp';
+export * from './ko-kr';

docs/.vuepress/notes/ja-jp.ts

@@ -0,0 +1,8 @@
+import { defineNotesConfig } from 'vuepress-theme-plume';
+import { genNotes } from './genSidebar';
+
+export const jajpNotes = defineNotesConfig({
+  dir: 'ja-jp',
+  link: '/ja-jp/',
+  notes: genNotes('ja-jp'),
+});

docs/.vuepress/notes/ko-kr.ts

@@ -0,0 +1,8 @@
+import { defineNotesConfig } from 'vuepress-theme-plume';
+import { genNotes } from './genSidebar';
+
+export const kokrNotes = defineNotesConfig({
+  dir: 'ko-kr',
+  link: '/ko-kr/',
+  notes: genNotes('ko-kr'),
+});

docs/.vuepress/notes/zh-cn.ts

@@ -0,0 +1,8 @@
+import { defineNotesConfig } from 'vuepress-theme-plume';
+import { genNotes } from './genSidebar';
+
+export const zhcnNotes = defineNotesConfig({
+  dir: 'zh-cn',
+  link: '/zh-cn/',
+  notes: genNotes('zh-cn'),
+});

docs/.vuepress/notes/zh-tw.ts

@@ -0,0 +1,8 @@
+import { defineNotesConfig } from 'vuepress-theme-plume';
+import { genNotes } from './genSidebar';
+
+export const zhtwNotes = defineNotesConfig({
+  dir: 'zh-tw',
+  link: '/zh-tw/',
+  notes: genNotes('zh-tw'),
+});

docs/.vuepress/plugins/search.ts

@@ -1,88 +1,84 @@
 export default {
-    appId: "99JM20SIFG",
-    apiKey: "7596a5a8c95cd64d4cf3050c9a4f878e",
-    indexName: "maa",
-    // 这里应该把所有本地化配置都放入 locales 中
-    locales: {
-        "/zh-cn/": {
-            placeholder: "搜索",
-            translations: {
-                button: {
-                    buttonText: "搜索",
-                },
-                modal: {
-                    searchBox: {
-                        resetButtonTitle: "清除查询条件",
-                        cancelButtonText: "取消",
-                    },
-                    startScreen: {
-                        recentSearchesTitle: "搜索历史",
-                        noRecentSearchesText: "没有搜索历史",
-                        saveRecentSearchButtonTitle: "保存至搜索历史",
-                        removeRecentSearchButtonTitle: "从搜索历史中移除",
-                        favoriteSearchesTitle: "收藏",
-                        removeFavoriteSearchButtonTitle: "从收藏中移除",
-                    },
-                    errorScreen: {
-                        titleText: "无法获取结果",
-                        helpText: "你可能需要检查你的网络连接",
-                    },
-                    footer: {
-                        selectText: "选择",
-                        navigateText: "切换",
-                        closeText: "关闭",
-                        searchByText: "搜索提供者",
-                    },
-                    noResultsScreen: {
-                        noResultsText: "无法找到相关结果",
-                        suggestedQueryText: "你可以尝试查询",
-                        reportMissingResultsText: "你认为该查询应该有结果？",
-                        reportMissingResultsLinkText: "点击反馈",
-                    },
-                },
-            },
+  provider: 'algolia' as const,
+  appId: '99JM20SIFG',
+  apiKey: '7596a5a8c95cd64d4cf3050c9a4f878e',
+  indexName: 'maa',
+  locales: {
+    '/zh-cn/': {
+      placeholder: '搜索',
+      translations: {
+        button: {
+          buttonText: '搜索',
         },
-        "/en-us/": {
-            placeholder: "Search",
-            translations: {
-                button: {
-                    buttonText: "Search",
-                },
-                modal: {
-                    searchBox: {
-                        resetButtonTitle: "Clear the query",
-                        cancelButtonText: "Cancel",
-                    },
-                    startScreen: {
-                        recentSearchesTitle: "Recent",
-                        noRecentSearchesText: "No recent searches",
-                        saveRecentSearchButtonTitle: "Save this search",
-                        removeRecentSearchButtonTitle:
-                            "Remove this search from history",
-                        favoriteSearchesTitle: "Favorite",
-                        removeFavoriteSearchButtonTitle:
-                            "Remove this search from favorites",
-                    },
-                    errorScreen: {
-                        titleText: "Unable to fetch results",
-                        helpText:
-                            "You might want to check your network connection.",
-                    },
-                    footer: {
-                        selectText: "to select",
-                        navigateText: "to navigate",
-                        closeText: "to close",
-                        searchByText: "Search by",
-                    },
-                    noResultsScreen: {
-                        noResultsText: "No results for",
-                        suggestedQueryText: "Try searching for",
-                        reportMissingResultsText:
-                            "Believe this query should return results?",
-                        reportMissingResultsLinkText: "Let us know.",
-                    },
-                },
-            },
+        modal: {
+          searchBox: {
+            resetButtonTitle: '清除查询条件',
+            cancelButtonText: '取消',
+          },
+          startScreen: {
+            recentSearchesTitle: '搜索历史',
+            noRecentSearchesText: '没有搜索历史',
+            saveRecentSearchButtonTitle: '保存至搜索历史',
+            removeRecentSearchButtonTitle: '从搜索历史中移除',
+            favoriteSearchesTitle: '收藏',
+            removeFavoriteSearchButtonTitle: '从收藏中移除',
+          },
+          errorScreen: {
+            titleText: '无法获取结果',
+            helpText: '你可能需要检查你的网络连接',
+          },
+          footer: {
+            selectText: '选择',
+            navigateText: '切换',
+            closeText: '关闭',
+            searchByText: '搜索提供者',
+          },
+          noResultsScreen: {
+            noResultsText: '无法找到相关结果',
+            suggestedQueryText: '你可以尝试查询',
+            reportMissingResultsText: '你认为该查询应该有结果？',
+            reportMissingResultsLinkText: '点击反馈',
+          },
         },
+      },
     },
+    '/en-us/': {
+      placeholder: 'Search',
+      translations: {
+        button: {
+          buttonText: 'Search',
+        },
+        modal: {
+          searchBox: {
+            resetButtonTitle: 'Clear the query',
+            cancelButtonText: 'Cancel',
+          },
+          startScreen: {
+            recentSearchesTitle: 'Recent',
+            noRecentSearchesText: 'No recent searches',
+            saveRecentSearchButtonTitle: 'Save this search',
+            removeRecentSearchButtonTitle: 'Remove this search from history',
+            favoriteSearchesTitle: 'Favorite',
+            removeFavoriteSearchButtonTitle: 'Remove this search from favorites',
+          },
+          errorScreen: {
+            titleText: 'Unable to fetch results',
+            helpText: 'You might want to check your network connection.',
+          },
+          footer: {
+            selectText: 'to select',
+            navigateText: 'to navigate',
+            closeText: 'to close',
+            searchByText: 'Search by',
+          },
+          noResultsScreen: {
+            noResultsText: 'No results for',
+            suggestedQueryText: 'Try searching for',
+            reportMissingResultsText: 'Believe this query should return results?',
+            reportMissingResultsLinkText: 'Let us know.',
+          },
+        },
+      },
+    },
+  },
 };

docs/.vuepress/plume.config.ts

@@ -0,0 +1,129 @@
+import { defineThemeConfig } from 'vuepress-theme-plume';
+import { zhcnNavbar, zhtwNavbar, enusNavbar, jajpNavbar, kokrNavbar } from './navbar';
+import { zhcnNotes, zhtwNotes, enusNotes, jajpNotes, kokrNotes } from './notes';
+
+export default defineThemeConfig({
+  logo: '/images/maa-logo_512x512.png',
+
+  appearance: true,
+
+  social: [
+    { icon: 'qq', link: 'https://api.maa.plus/MaaAssistantArknights/api/qqgroup' },
+    { icon: 'discord', link: 'https://discord.gg/23DfZ9uA4V' },
+    { icon: 'telegram', link: 'https://t.me/+Mgc2Zngr-hs3ZjU1' },
+    { icon: 'bilibili', link: 'https://space.bilibili.com/3493274731940507/' },
+    { icon: 'github', link: 'https://github.com/MaaAssistantArknights/MaaAssistantArknights/' },
+  ],
+  navbarSocialInclude: ['qq', 'discord', 'telegram', 'bilibili', 'github'],
+
+  aside: true,
+  // outline: [2, 3, 4, 5],
+  copyright: false,
+  prevPage: false,
+  nextPage: false,
+  createTime: false,
+
+  footer: false,
+
+  locales: {
+    '/zh-cn/': {
+      navbar: zhcnNavbar,
+      notes: zhcnNotes,
+    },
+    '/zh-tw/': {
+      navbar: zhtwNavbar,
+      notes: zhtwNotes,
+    },
+    '/en-us/': {
+      navbar: enusNavbar,
+      notes: enusNotes,
+    },
+    '/ja-jp/': {
+      navbar: jajpNavbar,
+      notes: jajpNotes,
+    },
+    '/ko-kr/': {
+      navbar: kokrNavbar,
+      notes: kokrNotes,
+    },
+  },
+
+  autoFrontmatter: false,
+
+  //plugins: {
+  //  notice: [
+  //    {
+  //      path: "/zh-tw/",
+  //      title: "翻译警告",
+  //      content: "MAA 的文檔以簡體中文為主，其他語言的文檔可能品質低或尚未翻譯，請諒解。",
+  //      fullscreen: true,
+  //      confirm: true,
+  //      showOnce: true,
+  //      actions: [
+  //        {
+  //          text: "我知道了",
+  //          type: "primary",
+  //        },
+  //        {
+  //          text: "前往簡體中文",
+  //          link: "/zh-cn/",
+  //        },
+  //      ],
+  //    },
+  //    {
+  //      path: "/en-us/",
+  //      title: "Translation Warning",
+  //      content: "MAA's documents are mainly in Simplified Chinese. Documents in other languages may be of low quality or not yet translated. Please understand.",
+  //      fullscreen: true,
+  //      confirm: true,
+  //      showOnce: true,
+  //      actions: [
+  //        {
+  //          text: "Okay",
+  //          type: "primary",
+  //        },
+  //        {
+  //          text: "Take me to zh-CN",
+  //          link: "/zh-cn/",
+  //        },
+  //      ],
+  //    },
+  //    {
+  //      path: "/ja-jp/",
+  //      title: "翻訳に関する警告",
+  //      content: "MAA のドキュメントは主に簡体字中国語で書かれており、他の言語のドキュメントは低品質であるか、翻訳されていない可能性がありますので、ご了承ください。",
+  //      fullscreen: true,
+  //      confirm: true,
+  //      showOnce: true,
+  //      actions: [
+  //        {
+  //          text: "OK",
+  //          type: "primary",
+  //        },
+  //        {
+  //          text: "中国語サイトへ行く",
+  //          link: "/zh-cn/",
+  //        },
+  //      ],
+  //    },
+  //    {
+  //      path: "/ko-kr/",
+  //      title: "번역 경고",
+  //      content: "MAA의 문서는 주로 중국어 간체로 되어 있습니다. 다른 언어로 된 문서는 번역이 이상하거나, 번역이 되어있지 않을 수 있습니다.",
+  //      fullscreen: true,
+  //      confirm: true,
+  //      showOnce: true,
+  //      actions: [
+  //        {
+  //          text: "OK",
+  //          type: "primary",
+  //        },
+  //        {
+  //          text: "중국어 간체로 이동",
+  //          link: "/zh-cn/",
+  //        },
+  //      ],
+  //    },
+  //  ],
+  //},
+});