Blueprint factory function added

Author: nakosung

Examples/Content/Scripts/helloJS.js

@@ -119,9 +119,11 @@
             }
             Drop(event) {
                 sprite.SetVisibility('Hidden')
+                console.log('ok')
             }
             DragCancelled(event) {
                 sprite.SetVisibility('Hidden')
+                console.log('cancel')
             }
         }
         let DragOp_C = uclass(DragOp)
@@ -137,7 +139,7 @@
                 let op = WidgetBlueprintLibrary.CreateDragDropOperation(DragOp_C)
                 sprite.SetVisibility('Visible')
                 return {
-                    $: WidgetBlueprintLibrary.Handled(),
+                    $: EventReply.Handled(),
                     Operation: op   
                 } 
             }
@@ -156,7 +158,7 @@
             }
             OnDrop(x) {
                 console.log('dropped',x)
-                return WidgetBlueprintLibrary.Handled()
+                return EventReply.Handled()
             }
         }
         let MyDraggable_C = uclass(MyDraggable)
@@ -171,7 +173,10 @@
                         UMG(Border,{BrushColor:{R:1,A:0.5}},"Drop target")
                     )
                 ),
-                UMG(CanvasPanel,{'Slot.HorizontalAlignment':'HAlign_Fill','Slot.VerticalAlignment':'VAlign_Fill'},
+                UMG(CanvasPanel,{
+                    'Visibility':'HitTestInvisible',
+                    'Slot.HorizontalAlignment':'HAlign_Fill','Slot.VerticalAlignment':'VAlign_Fill'
+                    },
                     UMG(Border,{Visibility:'Hidden',$link:elem => sprite = elem})
                 )
             )

Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp

@@ -402,6 +402,13 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 							BlueprintFunctionLibraryMapping.Add(p->Struct, Function);
 						}
 					}
+					else if ((Function->FunctionFlags & FUNC_Static) && It && (It->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == (CPF_Parm | CPF_ReturnParm))
+					{
+						if (auto p = Cast<UStructProperty>(*It))
+						{
+							BlueprintFunctionLibraryFactoryMapping.Add(p->Struct, Function);
+						}
+					}
 				}
 			}
 		}
@@ -1162,7 +1169,48 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 
 		// Register the function to prototype template
 		Template->PrototypeTemplate()->Set(function_name, function);		
-	}	
+	}
+
+	void ExportBlueprintLibraryFactoryFunction(Handle<FunctionTemplate> Template, UFunction* FunctionToExport)
+	{
+		FIsolateHelper I(isolate_);
+
+		// Exposed function body (it doesn't capture anything)
+		auto FunctionBody = [](const FunctionCallbackInfo<Value>& info)
+		{
+			auto isolate = info.GetIsolate();
+
+			auto self = info.Holder();
+
+			// Retrieve "FUNCTION"
+			auto Function = reinterpret_cast<UFunction*>((Local<External>::Cast(info.Data()))->Value());
+
+			// 'this' should be CDO of owner class
+			auto Object = Function->GetOwnerClass()->ClassDefaultObject;
+
+			info.GetReturnValue().Set(
+				// Call unreal engine function!
+				CallFunction(isolate, self, Function, Object, [&](int ArgIndex) -> Local<Value> {
+					// pass an argument if we have
+					if (ArgIndex < info.Length())
+					{
+						return info[ArgIndex];
+					}
+					// Otherwise, just return undefined.
+					else
+					{
+						return Undefined(isolate);
+					}
+				})
+			);
+		};
+
+		auto function_name = I.Keyword(FV8Config::Safeify(FunctionToExport->GetName()));
+		auto function = I.FunctionTemplate(FunctionBody, FunctionToExport);
+
+		// Register the function to prototype template
+		Template->Set(function_name, function);
+	}
 
 	template <typename PropertyAccessors>
 	void ExportProperty(Handle<FunctionTemplate> Template, UProperty* PropertyToExport, int32 PropertyIndex) 
@@ -1211,6 +1259,12 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 		{
 			ExportBlueprintLibraryFunction(Template, Function);			
 		}
+
+		BlueprintFunctionLibraryFactoryMapping.MultiFind(ClassToExport, Functions);
+		for (auto Function : Functions)
+		{
+			ExportBlueprintLibraryFactoryFunction(Template, Function);
+		}
 	}
 
 	void AddMemberFunction_Class_GetClassObject(Local<FunctionTemplate> Template, UStruct* ClassToExport)

Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.h

@@ -29,6 +29,8 @@ class FJavascriptIsolate
 	/** BlueprintFunctionLibrary function mapping */
 	TMultiMap< const UStruct*, UFunction*> BlueprintFunctionLibraryMapping;
 
+	TMultiMap< const UStruct*, UFunction*> BlueprintFunctionLibraryFactoryMapping;
+
 	TArray<FPendingClassConstruction> ObjectUnderConstructionStack;
 
 	v8::Isolate* isolate_;

Plugins/UnrealJS/Source/V8/Private/TypingGenerator.h

@@ -297,7 +297,7 @@ struct TypingGenerator : TypingGeneratorBase
 			w.push(";\n");
 		}
 
-		auto write_function = [&](UFunction* Function, bool is_thunk) {
+		auto write_function = [&](UFunction* Function, bool is_thunk, bool is_factory = false) {
 			w.tooltip("\t", Function);
 
 			w.push("\t");
@@ -455,6 +455,12 @@ struct TypingGenerator : TypingGeneratorBase
 			{
 				write_function(Function, true);
 			}
+
+			Environment.BlueprintFunctionLibraryFactoryMapping.MultiFind(source, Functions);
+			for (auto Function : Functions)
+			{
+				write_function(Function, false, true);
+			}
 		}
 
 		w.push("}\n\n");