Mutual inheritance between pz class and ts class (#124)

* refactor: Refactoring the logic of mutual inheritance between pz classes and ts classes and related logic

* test: Test case for adding logical refactoring that inherits from each other between the pz class and ts class

---------

Co-authored-by: zhangzemeng <[email protected]>

Author: PurpleNoon

lua/classcreate_template.lua

@@ -1,54 +1,55 @@
-local function __PW__ClassExtends(target, base)
-
-    target.____super = base;
-
-    local staticMetatable = setmetatable({ __index = base }, base);
-    setmetatable(target, staticMetatable);
-
-    local baseMetatable = getmetatable(base);
-    if baseMetatable then
-        if type(baseMetatable.__index) == "function" then
-            staticMetatable.__index = baseMetatable.__index;
-        end
-        if type(baseMetatable.__newindex) == "function" then
-            staticMetatable.__newindex = baseMetatable.__newindex;
-        end
-    end
-
-    ------------------------------------
-
-    -- PZ Class-Structure reroute.
-    if base.prototype == nil then
-        base.prototype = base;
+local ____lualib = require('lualib_bundle')
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+
+-- insert before ts class extends
+local function __PW__ClassExtendsPatch(target, base)
+    -- PZ fix
+    -- if base is pz class, then add ts class prop
+    if base.prototype == nil and base.Type then
+        base.prototype = base
+        base.prototype.constructor = base;
     end
+end
 
-    -- PZ 'Type' field reroute. 
-    target.Type = target.prototype.name;
-    target.prototype.Type = target.Type;
+local function derive(self, type)
+    local __Cls = __TS__Class()
+    __Cls.name = type
+    __Cls.Type = type
 
-    -- PZ Constructor reroute.
-    if base.prototype.new then
-        base.prototype.____constructor = base.prototype.new;
-        target.prototype.____constructor = base.prototype.new;
-    end
-
-    ------------------------------------
+    __PW__ClassExtendsPatch(__Cls, self)
+    __TS__ClassExtends(__Cls, self)
+    return __Cls
+end
 
-    setmetatable(target.prototype, base.prototype);
+local function new(self, ...)
+    return __TS__New(self, ...)
+end
 
-    if type(base.prototype.__index) == "function" then
-        target.prototype.__index = base.prototype.__index;
-    end
+-- top level base class, like Object class in js or ISBaseObject class in pz
+local __PW__BaseClass = __TS__Class()
+__PW__BaseClass.name = '__PW__BaseClass'
+__PW__BaseClass.Type = __PW__BaseClass.name
+__PW__BaseClass.prototype.derive = derive
+__PW__BaseClass.prototype.new = new
 
-    if type(base.prototype.__newindex) == "function" then
-        target.prototype.__newindex = base.prototype.__newindex;
-    end
+-- insert after ts class name set
+local function __PW__ClassPatch(cls)
+    cls.Type = cls.name
+end
 
-    if type(base.prototype.__tostring) == "function" then
-        target.prototype.__tostring = base.prototype.__tostring;
-    end
+-- add
+local function __PW__BaseClassExtends(cls)
+    -- if cls not extend other class, then extend base class
+    -- to get the implementation of derive and new
+    __TS__ClassExtends(cls, __PW__BaseClass)
 end
 
 return {
-    __PW__ClassExtends = __PW__ClassExtends
+    __PW__ClassExtendsPatch = __PW__ClassExtendsPatch,
+    __PW__ClassPatch = __PW__ClassPatch,
+    -- expose base class for third-party modification
+    __PW__BaseClass = __PW__BaseClass,
+    __PW__BaseClassExtends = __PW__BaseClassExtends,
 }

lua/pipewrench_fixes.lua

@@ -18,9 +18,7 @@
   "files": [
     "dist/index.js",
     "dist/config.js",
-    "lua/reimport_template.lua",
-    "lua/pipewrench_fixes.lua",
-    "lua/classcreate_template.lua"
+    "lua/pipewrench_fixes.lua"
   ],
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",