Merge pull request #5 from puerts/dev

重构
puerts · Feb 26, 2025 · 2cc68b4 · 2cc68b4
2 parents 3981435 + f020865
commit 2cc68b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/include/CppObjectMapper.h b/include/CppObjectMapper.h
@@ -121,15 +121,15 @@ struct CppObjectMapper
 
     JSValue CreateFunction(pesapi_callback Callback, void* Data, pesapi_function_finalize Finalize);
 
-    JSValue CreateClassByID(const void* typeId);
+    JSValue FindOrCreateClassByID(const void* typeId);
 
     static JSValue CreateError(JSContext* ctx, const char* message);
 
     JSValue MakeMethod(pesapi_callback Callback, void* Data);
     void InitMethod(puerts::JSFunctionInfo* FuncInfo, JSValue Obj);
     void InitProperty(puerts::JSPropertyInfo* PropInfo, JSValue Obj);
 
-    JSValue CreateClass(const puerts::JSClassDefinition* ClassDefinition);
+    JSValue FindOrCreateClass(const puerts::JSClassDefinition* ClassDefinition);
 
     void BindAndAddToCache(const puerts::JSClassDefinition* typeInfo, const void* ptr, JSValue value, bool callFinalize);
 

diff --git a/source/CppObjectMapper.cpp b/source/CppObjectMapper.cpp
@@ -152,7 +152,7 @@ JSValue CppObjectMapper::PushNativeObject(const void* TypeId, void* ObjectPtr, b
     {
         ClassDefinition = &PtrClassDef;
     }
-    JSValue ctor = CreateClass(ClassDefinition);
+    JSValue ctor = FindOrCreateClass(ClassDefinition);
     JSValue proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
     JSValue obj = JS_NewObjectProtoClass(ctx, proto, classId);
     JS_FreeValue(ctx, proto);
@@ -224,7 +224,7 @@ void CppObjectMapper::InitProperty(puerts::JSPropertyInfo* PropInfo, JSValue Obj
     JS_FreeValue(ctx, setter);
 }
 
-JSValue CppObjectMapper::CreateClass(const puerts::JSClassDefinition* ClassDefinition)
+JSValue CppObjectMapper::FindOrCreateClass(const puerts::JSClassDefinition* ClassDefinition)
 {
     auto it = TypeIdToFunctionMap.find(ClassDefinition->TypeId);
     if (it == TypeIdToFunctionMap.end())
@@ -312,7 +312,7 @@ JSValue CppObjectMapper::CreateClass(const puerts::JSClassDefinition* ClassDefin
         {
             if (auto SuperDefinition = puerts::FindClassByID(ClassDefinition->SuperTypeId))
             {
-                JSValue super_func = CreateClass(SuperDefinition);
+                JSValue super_func = FindOrCreateClass(SuperDefinition);
                 JSValue parent_proto = JS_GetProperty(ctx, super_func, JS_ATOM_prototype);
                 JS_SetPrototype(ctx, proto, parent_proto);
                 JS_FreeValue(ctx, parent_proto);
@@ -326,14 +326,14 @@ JSValue CppObjectMapper::CreateClass(const puerts::JSClassDefinition* ClassDefin
     return it->second;
 }
 
-JSValue CppObjectMapper::CreateClassByID(const void* typeId)
+JSValue CppObjectMapper::FindOrCreateClassByID(const void* typeId)
 {
     auto clsDef = puerts::LoadClassByID(typeId);
     if (!clsDef)
     {
         return JS_UNDEFINED;
     }
-    return CreateClass(clsDef);
+    return FindOrCreateClass(clsDef);
 }
 
 void CppObjectMapper::Initialize(JSContext* ctx_)

diff --git a/source/PapiQuickjsImpl.cpp b/source/PapiQuickjsImpl.cpp
@@ -196,7 +196,7 @@ pesapi_value pesapi_create_class(pesapi_env env, const void* type_id)
 {
     auto ctx = qjsContextFromPesapiEnv(env);
     auto ret = allocValueInCurrentScope(ctx);
-    *ret = pesapi::qjsimpl::CppObjectMapper::Get(ctx)->CreateClassByID(type_id);
+    *ret = pesapi::qjsimpl::CppObjectMapper::Get(ctx)->FindOrCreateClassByID(type_id);
     JS_DupValue(ctx, *ret);
     return pesapiValueFromQjsValue(ret);
 }