From be693b2611c314935d83f525096d21c45aaf2f51 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmat@mail.ru>
Date: Tue, 18 Feb 2025 00:20:09 +0700
Subject: [PATCH] style fixes

---
 README.md   |  5 +++--
 evolved.lua | 35 ++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 6849e5a..53f26a8 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,13 @@ ON_ASSIGN :: fragment
 ON_INSERT :: fragment
 ON_REMOVE :: fragment
 
+PHASE :: fragment
 AFTER :: fragment
 BEFORE :: fragment
 
-PHASE :: fragment
 QUERY :: fragment
 EXECUTE :: fragment
+
 PROLOGUE :: fragment
 EPILOGUE :: fragment
 ```
@@ -134,9 +135,9 @@ phase_builder:build :: phase, boolean
 
 ```
 system :: system_builder
+system_builder:phase :: phase -> system_builder
 system_builder:after :: system... -> system_builder
 system_builder:before :: system... -> system_builder
-system_builder:phase :: phase -> system_builder
 system_builder:query :: query -> system_builder
 system_builder:execute :: {chunk, entity[], integer} -> system_builder
 system_builder:prologue :: {} -> system_builder
diff --git a/evolved.lua b/evolved.lua
index d31a2bb..6a5a936 100644
--- a/evolved.lua
+++ b/evolved.lua
@@ -419,12 +419,13 @@ evolved.ON_ASSIGN = __acquire_id()
 evolved.ON_INSERT = __acquire_id()
 evolved.ON_REMOVE = __acquire_id()
 
+evolved.PHASE = __acquire_id()
 evolved.AFTER = __acquire_id()
 evolved.BEFORE = __acquire_id()
 
-evolved.PHASE = __acquire_id()
 evolved.QUERY = __acquire_id()
 evolved.EXECUTE = __acquire_id()
+
 evolved.PROLOGUE = __acquire_id()
 evolved.EPILOGUE = __acquire_id()
 
@@ -6179,9 +6180,9 @@ end
 ---
 
 ---@class (exact) evolved.__system_builder
+---@field package __phase? evolved.phase
 ---@field package __after? evolved.system[]
 ---@field package __before? evolved.system[]
----@field package __phase? evolved.phase
 ---@field package __query? evolved.query
 ---@field package __execute? evolved.execute
 ---@field package __prologue? evolved.prologue
@@ -6196,9 +6197,9 @@ evolved_system_builder.__index = evolved_system_builder
 function evolved.system()
     ---@type evolved.__system_builder
     local builder = {
+        __phase = nil,
         __after = nil,
         __before = nil,
-        __phase = nil,
         __query = nil,
         __execute = nil,
         __prologue = nil,
@@ -6208,6 +6209,12 @@ function evolved.system()
     return setmetatable(builder, evolved_system_builder)
 end
 
+---@param phase evolved.phase
+function evolved_system_builder:phase(phase)
+    self.__phase = phase
+    return self
+end
+
 ---@param ... evolved.system systems
 ---@return evolved.system_builder builder
 function evolved_system_builder:after(...)
@@ -6260,12 +6267,6 @@ function evolved_system_builder:before(...)
     return self
 end
 
----@param phase evolved.phase
-function evolved_system_builder:phase(phase)
-    self.__phase = phase
-    return self
-end
-
 ---@param query evolved.query
 function evolved_system_builder:query(query)
     self.__query = query
@@ -6293,17 +6294,17 @@ end
 ---@return evolved.system system
 ---@return boolean is_deferred
 function evolved_system_builder:build()
+    local phase = self.__phase
     local after = self.__after
     local before = self.__before
-    local phase = self.__phase
     local query = self.__query
     local execute = self.__execute
     local prologue = self.__prologue
     local epilogue = self.__epilogue
 
+    self.__phase = nil
     self.__after = nil
     self.__before = nil
-    self.__phase = nil
     self.__query = nil
     self.__execute = nil
     self.__prologue = nil
@@ -6313,6 +6314,12 @@ function evolved_system_builder:build()
     local component_list = __acquire_table(__TABLE_POOL_TAG__COMPONENT_LIST)
     local component_count = 0
 
+    if phase then
+        component_count = component_count + 1
+        fragment_list[component_count] = evolved.PHASE
+        component_list[component_count] = phase
+    end
+
     if after then
         component_count = component_count + 1
         fragment_list[component_count] = evolved.AFTER
@@ -6325,12 +6332,6 @@ function evolved_system_builder:build()
         component_list[component_count] = before
     end
 
-    if phase then
-        component_count = component_count + 1
-        fragment_list[component_count] = evolved.PHASE
-        component_list[component_count] = phase
-    end
-
     if query then
         component_count = component_count + 1
         fragment_list[component_count] = evolved.QUERY