Skip to content

修复(引入新的import时) ts代码热编译时，继承自UObject的Ts类不生效的问题 #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lilien-Gamer wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −25
Open

修复(引入新的import时) ts代码热编译时，继承自UObject的Ts类不生效的问题 #2339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 47 additions & 25 deletions unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,37 +1395,33 @@ void FJsEnvImpl::MakeSureInject(UTypeScriptGeneratedClass* TypeScriptGeneratedCl

TryReleaseType(TypeScriptGeneratedClass);
auto NativeCtor = GetJsClass(TypeScriptGeneratedClass, Context);
//如果已经有了bindinfoptr(此时forcereinject一定是true),这种情况下prototype是已经设置过了的,因此不用重复设置prototype
if (!(BindInfoPtr && ForceReinject))

// Hot reload must refresh NativeProto own methods and prototype chain for existing UObject wrappers.
v8::Local<v8::Value> VNativeProto;
if (NativeCtor->Get(Context, FV8Utils::ToV8String(Isolate, "prototype")).ToLocal(&VNativeProto) &&
VNativeProto->IsObject())
{
v8::Local<v8::Value> VNativeProto;
if (NativeCtor->Get(Context, FV8Utils::ToV8String(Isolate, "prototype")).ToLocal(&VNativeProto) &&
VNativeProto->IsObject())
//{} -> Native Prototype -> Js Prototype -> Super Prototype
v8::Local<v8::Object> NativeProto = VNativeProto.As<v8::Object>();
__USE(BindInfoMap[TypeScriptGeneratedClass].Prototype.Get(Isolate)->SetPrototype(
Context, NativeProto));
if (SuperClass)
{
//{} -> Native Prototype -> Js Prototype -> Super Prototype
v8::Local<v8::Object> NativeProto = VNativeProto.As<v8::Object>();
__USE(BindInfoMap[TypeScriptGeneratedClass].Prototype.Get(Isolate)->SetPrototype(
Context, NativeProto));
if (SuperClass)
{
__USE(Proto->SetPrototype(Context, BindInfoMap[SuperClass].Prototype.Get(Isolate)));
}
else
{
__USE(Proto->SetPrototype(Context, NativeProto->GetPrototype()));
}
__USE(NativeProto->SetPrototype(Context, Proto));

#if !PUERTS_FORCE_CPP_UFUNCTION
v8::Local<v8::Value> MergeArgs[] = {Proto, NativeProto, NetMethods};

__USE(MergePrototype.Get(Isolate)->Call(Context, v8::Undefined(Isolate), 3, MergeArgs));
#endif
__USE(Proto->SetPrototype(Context, BindInfoMap[SuperClass].Prototype.Get(Isolate)));
}
else
{
__USE(BindInfoMap[TypeScriptGeneratedClass].Prototype.Get(Isolate)->SetPrototype(Context, Proto));
__USE(Proto->SetPrototype(Context, NativeProto->GetPrototype()));
}
__USE(NativeProto->SetPrototype(Context, Proto));
#if !PUERTS_FORCE_CPP_UFUNCTION
v8::Local<v8::Value> MergeArgs[] = {Proto, NativeProto, NetMethods};
__USE(MergePrototype.Get(Isolate)->Call(Context, v8::Undefined(Isolate), 3, MergeArgs));
#endif
}
else
{
__USE(BindInfoMap[TypeScriptGeneratedClass].Prototype.Get(Isolate)->SetPrototype(Context, Proto));
}

if (RebindObject)
Expand Down Expand Up @@ -1493,6 +1489,32 @@ void FJsEnvImpl::JsHotReload(FName ModuleName, const FString& JsSource)
{
Logger->Error(FString::Printf(TEXT("reload module exception %s"), *FV8Utils::TryCatchToString(Isolate, &TryCatch)));
}
else
{
FString NormalizedModuleName = ModuleName.ToString().Replace(TEXT("\\"), TEXT("/"));
static FString PackageNamePrefix(TEXT(TS_BLUEPRINT_PATH));
for (TObjectIterator<UTypeScriptGeneratedClass> It; It; ++It)
{
UTypeScriptGeneratedClass* TypeScriptGeneratedClass = *It;
auto Package = Cast<UPackage>(TypeScriptGeneratedClass->GetOuter());
if (!Package || TypeScriptGeneratedClass->NotSupportInject())
{
continue;
}
FString PackageName = Package->GetName();
auto PrefixPos = PackageName.Find(PackageNamePrefix);
if (PrefixPos == INDEX_NONE)
{
continue;
}
FString ClassModuleName = PackageName.Mid(PrefixPos + PackageNamePrefix.Len()).Replace(TEXT("\\"), TEXT("/"));
if (ClassModuleName == NormalizedModuleName)
{
MakeSureInject(TypeScriptGeneratedClass, true, true);
break;
}
}
}
}
else
{
Expand Down