fix require.main == module (EvalMain)

ialex32x · ialex32x · commit 61a4f9b6eab1 · 2021-08-21T18:45:07.000+08:00
diff --git a/Assets/Examples/Source/ExtensionTest.cs b/Assets/Examples/Source/ExtensionTest.cs
@@ -29,5 +29,10 @@ public static bool TestWithArgsAndOut(this Transform transform, Vector3 pos, Qua
             dist = pos.magnitude;
             return true;
         }
+
+        public static void TestWithScriptObject(this Transform transform, ScriptFunction function)
+        {
+            function?.Invoke();
+        }
     }
 }
diff --git a/Assets/Examples/Source/Sample.cs b/Assets/Examples/Source/Sample.cs
@@ -89,7 +89,7 @@ void Awake()
                 byteBufferAllocator = new ByteBufferPooledAllocator(),
                 binder = DefaultBinder.GetBinder(useReflectBind),
             });
-            _rt.ResolveModule(entryFileName);
+            _rt.EvalMain(entryFileName);
         }
 
         void Update()
diff --git a/Assets/Generated/Typings/jsb.autogen.d.ts b/Assets/Generated/Typings/jsb.autogen.d.ts
diff --git a/Assets/jsb/Source/Binding/Editor/BindingManager.cs b/Assets/jsb/Source/Binding/Editor/BindingManager.cs
@@ -716,6 +716,12 @@ public string GetDefaultTypePrefix()
             return "jsb.";
         }
 
+        public string GetValueOperation(string operation, Type forType)
+        {
+            //TODO codegen: lookup js_* (push/get/rebind) for specified type (instead of the partial class 'Values')
+            return operation;
+        }
+
         public string GetCSNamespace(Type type)
         {
             return string.IsNullOrEmpty(type.Namespace) ? "" : (type.Namespace + ".");
diff --git a/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Event.cs b/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Event.cs
@@ -55,7 +55,8 @@ public EventOperationCodeGen(CodeGenerator cg, EventBindingInfo bindingInfo)
             if (declaringType.IsValueType && !eventInfo.GetAddMethod().IsStatic)
             {
                 // 非静态结构体属性修改, 尝试替换实例
-                this.cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");
+                var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", bindingInfo.declaringType);
+                this.cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");
             }
             this.cg.cs.AppendLine("return JSApi.JS_UNDEFINED;");
         }
diff --git a/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Field.cs b/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Field.cs
@@ -53,7 +53,8 @@ public FieldSetterCodeGen(CodeGenerator cg, FieldBindingInfo bindingInfo)
             if (declaringType.IsValueType && !fieldInfo.IsStatic)
             {
                 // 非静态结构体字段修改, 尝试替换实例
-                this.cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");
+                var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", declaringType);
+                this.cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");
             }
             this.cg.cs.AppendLine("return JSApi.JS_UNDEFINED;");
         }
diff --git a/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Method.cs b/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Method.cs
@@ -504,13 +504,14 @@ protected void SplitParamters(ParameterInfo[] parameters, int index, List<Parame
             }
         }
 
-        private void WriteRebindThis(MethodBase method, string caller)
+        private void WriteRebindThis(MethodBase method, Type callerType, string caller)
         {
             if (!method.IsStatic && method.DeclaringType.IsValueType) // struct 非静态方法 检查 Mutable 属性
             {
                 if (!string.IsNullOrEmpty(caller))
                 {
-                    cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");
+                    var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", callerType);
+                    cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");
                 }
             }
         }
@@ -532,7 +533,8 @@ protected void WriteCSMethodBinding(MethodBaseBindingInfo<T> bindingInfo, T meth
 
             // var isRaw = method.IsDefined(typeof(JSCFunctionAttribute));
             var parameters = method.GetParameters();
-            var caller = this.cg.AppendGetThisCS(method, isExtension);
+            Type callerType;
+            var caller = this.cg.AppendGetThisCS(method, isExtension, out callerType);
             var returnType = GetReturnType(method);
 
             if (returnType == null || returnType == typeof(void))
@@ -543,7 +545,7 @@ protected void WriteCSMethodBinding(MethodBaseBindingInfo<T> bindingInfo, T meth
                 this.EndInvokeBinding();
 
                 _WriteBackParameters(isExtension, parameters);
-                WriteRebindThis(method, caller);
+                WriteRebindThis(method, callerType, caller);
                 InvokeVoidReturn();
             }
             else
diff --git a/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Property.cs b/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenHelper_Property.cs
@@ -16,7 +16,8 @@ public PropertyGetterCodeGen(CodeGenerator cg, PropertyBindingInfo bindingInfo)
             this.cg = cg;
             this.bindingInfo = bindingInfo;
 
-            var caller = this.cg.AppendGetThisCS(bindingInfo.getMethod, false);
+            Type callerType;
+            var caller = this.cg.AppendGetThisCS(bindingInfo.getMethod, false, out callerType);
 
             this.cg.cs.AppendLine("var ret = {0}.{1};", caller, bindingInfo.propertyInfo.Name);
             var pusher = this.cg.AppendValuePusher(bindingInfo.propertyType, "ret");
@@ -40,7 +41,8 @@ public PropertySetterCodeGen(CodeGenerator cg, PropertyBindingInfo propertyBindi
 
             var propertyInfo = this.bindingInfo.propertyInfo;
             var declaringType = propertyInfo.DeclaringType;
-            var caller = this.cg.AppendGetThisCS(propertyBindingInfo.setMethod, false);
+            Type callerType;
+            var caller = this.cg.AppendGetThisCS(propertyBindingInfo.setMethod, false, out callerType);
             var propertyType = this.cg.bindingManager.GetCSTypeFullName(propertyInfo.PropertyType);
 
             this.cg.cs.AppendLine("{0} value;", propertyType);
@@ -54,7 +56,8 @@ public PropertySetterCodeGen(CodeGenerator cg, PropertyBindingInfo propertyBindi
             if (declaringType.IsValueType && !propertyBindingInfo.setMethod.IsStatic)
             {
                 // 非静态结构体属性修改, 尝试替换实例
-                this.cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");
+                var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", callerType);
+                this.cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");
             }
             this.cg.cs.AppendLine("return JSApi.JS_UNDEFINED;");
         }
diff --git a/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenerator.cs b/Assets/jsb/Source/Binding/Editor/Codegen/CodeGenerator.cs
@@ -512,17 +512,22 @@ public string AppendGetThisCS(EventBindingInfo bindingInfo)
             return caller;
         }
 
-        public string AppendGetThisCS(MethodBase method, bool asExtensionAnyway)
+        public string AppendGetThisCS(MethodBase method, bool asExtensionAnyway, out Type thisType)
         {
             if (method.IsConstructor)
             {
+                thisType = null;
                 return null;
             }
+            
             if (asExtensionAnyway)
             {
                 var parameters = method.GetParameters();
+                thisType = parameters[0].ParameterType;
                 return AppendGetThisCS(false, parameters[0].ParameterType);
             }
+
+            thisType = method.DeclaringType;
             return AppendGetThisCS(method.IsStatic, method.DeclaringType);
         }
 
diff --git a/Assets/jsb/Source/JSWorker.cs b/Assets/jsb/Source/JSWorker.cs
@@ -90,7 +90,7 @@ private void Start(JSContext ctx, JSValue value, string scriptPath)
             _runtime = runtime;
             _runtime.OnAfterDestroy += OnWorkerAfterDestroy;
             RegisterGlobalObjects();
-            _runtime.ResolveModule(scriptPath);
+            _runtime.EvalMain(scriptPath);
 
             _thread = new Thread(new ThreadStart(Run));
             _thread.Priority = ThreadPriority.Lowest;
diff --git a/Assets/jsb/Source/ScriptContext.cs b/Assets/jsb/Source/ScriptContext.cs
@@ -489,6 +489,11 @@ public void RaiseScriptReloadedEvent_throw(string resolved_id)
             OnScriptReloaded?.Invoke(this, resolved_id);
         }
 
+        public bool IsMainModuleLoaded() 
+        {
+            return _mainModuleLoaded;
+        }
+
 #if !JSB_UNITYLESS
         public bool CheckModuleId(Unity.JSScriptRef scriptRef, string resolved_id)
         {
diff --git a/Assets/jsb/Source/ScriptRuntime.cs b/Assets/jsb/Source/ScriptRuntime.cs
@@ -23,6 +23,7 @@ private class ScriptContextRef
 
         public event Action<ScriptRuntime> OnDestroy;
         public event Action<ScriptRuntime> OnInitialized;
+        public event Action<ScriptRuntime> OnMainModuleLoaded;
         public event Action<int> OnAfterDestroy;
         public event Action OnUpdate;
         public event Action<ScriptContext, string> OnScriptReloading;
@@ -172,13 +173,16 @@ public string ResolveFilePath(string parent_module_id, string module_id)
 
         public string ResolveModuleId(ScriptContext context, string parent_module_id, string module_id)
         {
-            for (int i = 0, count = _moduleResolvers.Count; i < count; i++)
+            if (module_id != null)
             {
-                var resolver = _moduleResolvers[i];
-                string resolved_id;
-                if (resolver.ResolveModule(_fileSystem, _pathResolver, parent_module_id, module_id, out resolved_id))
+                for (int i = 0, count = _moduleResolvers.Count; i < count; i++)
                 {
-                    return resolved_id;
+                    var resolver = _moduleResolvers[i];
+                    string resolved_id;
+                    if (resolver.ResolveModule(_fileSystem, _pathResolver, parent_module_id, module_id, out resolved_id))
+                    {
+                        return resolved_id;
+                    }
                 }
             }
 
@@ -737,6 +741,18 @@ public bool EnqueueAction(JSAction action)
             return true;
         }
 
+        public void EvalMain(string fileName)
+        {
+            if (_mainContext.IsMainModuleLoaded())
+            {
+                ResolveModule(fileName);
+                return;
+            }
+
+            ResolveModule(fileName);
+            OnMainModuleLoaded?.Invoke(this);
+        }
+
         public void EvalFile(string fileName)
         {
             EvalFile(fileName, typeof(void));
diff --git a/Assets/jsb/Source/Unity/Editor/CustomBindings/UnityBinding.cs b/Assets/jsb/Source/Unity/Editor/CustomBindings/UnityBinding.cs
@@ -118,6 +118,7 @@ public override void OnPreExporting(BindingManager bindingManager)
             bindingManager.AddExportedType(typeof(WaitForSeconds), true);
             bindingManager.AddExportedType(typeof(WaitForEndOfFrame), true);
             bindingManager.AddExportedType(typeof(Input));
+            bindingManager.AddExportedType(typeof(Application));
 
             bindingManager.AddExportedType(typeof(Ray));
             bindingManager.AddExportedType(typeof(RaycastHit));
diff --git a/Assets/jsb/Source/Unity/Editor/EditorRuntime.cs b/Assets/jsb/Source/Unity/Editor/EditorRuntime.cs
@@ -124,6 +124,7 @@ private void OnInit()
         private void OnScriptRuntimeCreated(ScriptRuntime runtime)
         {
             runtime.OnInitialized += OnScriptRuntimeInitialized;
+            runtime.OnMainModuleLoaded += OnScriptRuntimeMainModuleLoaded;
         }
 
         public TSConfig GetTSConfig(string workspace = null)
@@ -140,28 +141,17 @@ public TSConfig GetTSConfig(string workspace = null)
             return null;
         }
 
-        private void OnScriptRuntimeInitialized(ScriptRuntime runtime)
+        private void OnScriptRuntimeMainModuleLoaded(ScriptRuntime runtime)
         {
-            var tsconfig = GetTSConfig();
-
-            if (tsconfig != null)
-            {
-                runtime.AddSearchPath(tsconfig.compilerOptions.outDir);
-            }
-
-            if (!string.IsNullOrEmpty(_prefs.editorEntryPoint))
-            {
-                runtime.ResolveModule(_prefs.editorEntryPoint);
-            }
-
+            runtime.ResolveModule(_prefs.editorEntryPoint);
+            
             foreach (var module in _prefs.editorRequires)
             {
                 runtime.ResolveModule(module);
             }
 
             var editorScripts = new List<JSScriptClassPathHint>();
 
-            JSScriptFinder.GetInstance().ModuleSourceChanged += OnModuleSourceChanged;
             JSScriptFinder.GetInstance().Search(JSScriptClassType.CustomEditor, editorScripts);
 
             foreach (var editorScript in editorScripts)
@@ -175,6 +165,25 @@ private void OnScriptRuntimeInitialized(ScriptRuntime runtime)
             }
         }
 
+        private void OnScriptRuntimeInitialized(ScriptRuntime runtime)
+        {
+            var tsconfig = GetTSConfig();
+
+            if (tsconfig != null)
+            {
+                runtime.AddSearchPath(tsconfig.compilerOptions.outDir);
+            }
+            JSScriptFinder.GetInstance().ModuleSourceChanged += OnModuleSourceChanged;
+
+            if (!string.IsNullOrEmpty(_prefs.editorEntryPoint))
+            {
+                if (!Application.isPlaying)
+                {
+                    runtime.EvalMain(_prefs.editorEntryPoint);
+                }
+            }
+        }
+
         private void OnModuleSourceChanged(string modulePath, JSScriptClassType classTypes)
         {
             if ((classTypes & JSScriptClassType.CustomEditor) != 0 || _prefs.assetPostProcessors.Contains(modulePath))
diff --git a/Scripts/out/example_monobehaviour.js b/Scripts/out/example_monobehaviour.js
diff --git a/Scripts/out/example_monobehaviour.js.map b/Scripts/out/example_monobehaviour.js.map
diff --git a/Scripts/out/plover/editor/base/treeview.js.map b/Scripts/out/plover/editor/base/treeview.js.map
diff --git a/Scripts/src/example_monobehaviour.ts b/Scripts/src/example_monobehaviour.ts

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,10 @@ public static bool TestWithArgsAndOut(this Transform transform, Vector3 pos, Qua`
`29`	`29`	`dist = pos.magnitude;`
`30`	`30`	`return true;`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ public static void TestWithScriptObject(this Transform transform, ScriptFunction function)`
	`34`	`+ {`
	`35`	`+ function?.Invoke();`
	`36`	`+ }`
`32`	`37`	`}`
`33`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void Awake()`
`89`	`89`	`byteBufferAllocator = new ByteBufferPooledAllocator(),`
`90`	`90`	`binder = DefaultBinder.GetBinder(useReflectBind),`
`91`	`91`	`});`
`92`		`- _rt.ResolveModule(entryFileName);`
	`92`	`+ _rt.EvalMain(entryFileName);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`void Update()`
Original file line number	Diff line number	Diff line change
`@@ -716,6 +716,12 @@ public string GetDefaultTypePrefix()`
`716`	`716`	`return "jsb.";`
`717`	`717`	`}`
`718`	`718`
	`719`	`+ public string GetValueOperation(string operation, Type forType)`
	`720`	`+ {`
	`721`	`+ //TODO codegen: lookup js_* (push/get/rebind) for specified type (instead of the partial class 'Values')`
	`722`	`+ return operation;`
	`723`	`+ }`
	`724`	`+`
`719`	`725`	`public string GetCSNamespace(Type type)`
`720`	`726`	`{`
`721`	`727`	`return string.IsNullOrEmpty(type.Namespace) ? "" : (type.Namespace + ".");`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public EventOperationCodeGen(CodeGenerator cg, EventBindingInfo bindingInfo)`
`55`	`55`	`if (declaringType.IsValueType && !eventInfo.GetAddMethod().IsStatic)`
`56`	`56`	`{`
`57`	`57`	`// 非静态结构体属性修改, 尝试替换实例`
`58`		`- this.cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");`
	`58`	`+ var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", bindingInfo.declaringType);`
	`59`	`+ this.cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");`
`59`	`60`	`}`
`60`	`61`	`this.cg.cs.AppendLine("return JSApi.JS_UNDEFINED;");`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ public FieldSetterCodeGen(CodeGenerator cg, FieldBindingInfo bindingInfo)`
`53`	`53`	`if (declaringType.IsValueType && !fieldInfo.IsStatic)`
`54`	`54`	`{`
`55`	`55`	`// 非静态结构体字段修改, 尝试替换实例`
`56`		`- this.cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");`
	`56`	`+ var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", declaringType);`
	`57`	`+ this.cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");`
`57`	`58`	`}`
`58`	`59`	`this.cg.cs.AppendLine("return JSApi.JS_UNDEFINED;");`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -504,13 +504,14 @@ protected void SplitParamters(ParameterInfo[] parameters, int index, List<Parame`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`
`507`		`- private void WriteRebindThis(MethodBase method, string caller)`
	`507`	`+ private void WriteRebindThis(MethodBase method, Type callerType, string caller)`
`508`	`508`	`{`
`509`	`509`	`if (!method.IsStatic && method.DeclaringType.IsValueType) // struct 非静态方法检查 Mutable 属性`
`510`	`510`	`{`
`511`	`511`	`if (!string.IsNullOrEmpty(caller))`
`512`	`512`	`{`
`513`		`- cg.cs.AppendLine($"js_rebind_this(ctx, this_obj, ref {caller});");`
	`513`	`+ var js_rebind_this = this.cg.bindingManager.GetValueOperation("js_rebind_this", callerType);`
	`514`	`+ cg.cs.AppendLine($"{js_rebind_this}(ctx, this_obj, ref {caller});");`
`514`	`515`	`}`
`515`	`516`	`}`
`516`	`517`	`}`
`@@ -532,7 +533,8 @@ protected void WriteCSMethodBinding(MethodBaseBindingInfo<T> bindingInfo, T meth`
`532`	`533`
`533`	`534`	`// var isRaw = method.IsDefined(typeof(JSCFunctionAttribute));`
`534`	`535`	`var parameters = method.GetParameters();`
`535`		`- var caller = this.cg.AppendGetThisCS(method, isExtension);`
	`536`	`+ Type callerType;`
	`537`	`+ var caller = this.cg.AppendGetThisCS(method, isExtension, out callerType);`
`536`	`538`	`var returnType = GetReturnType(method);`
`537`	`539`
`538`	`540`	`if (returnType == null \|\| returnType == typeof(void))`
`@@ -543,7 +545,7 @@ protected void WriteCSMethodBinding(MethodBaseBindingInfo<T> bindingInfo, T meth`
`543`	`545`	`this.EndInvokeBinding();`
`544`	`546`
`545`	`547`	`_WriteBackParameters(isExtension, parameters);`
`546`		`- WriteRebindThis(method, caller);`
	`548`	`+ WriteRebindThis(method, callerType, caller);`
`547`	`549`	`InvokeVoidReturn();`
`548`	`550`	`}`
`549`	`551`	`else`
Original file line number	Diff line number	Diff line change
`@@ -512,17 +512,22 @@ public string AppendGetThisCS(EventBindingInfo bindingInfo)`
`512`	`512`	`return caller;`
`513`	`513`	`}`
`514`	`514`
`515`		`- public string AppendGetThisCS(MethodBase method, bool asExtensionAnyway)`
	`515`	`+ public string AppendGetThisCS(MethodBase method, bool asExtensionAnyway, out Type thisType)`
`516`	`516`	`{`
`517`	`517`	`if (method.IsConstructor)`
`518`	`518`	`{`
	`519`	`+ thisType = null;`
`519`	`520`	`return null;`
`520`	`521`	`}`
	`522`	`+`
`521`	`523`	`if (asExtensionAnyway)`
`522`	`524`	`{`
`523`	`525`	`var parameters = method.GetParameters();`
	`526`	`+ thisType = parameters[0].ParameterType;`
`524`	`527`	`return AppendGetThisCS(false, parameters[0].ParameterType);`
`525`	`528`	`}`
	`529`	`+`
	`530`	`+ thisType = method.DeclaringType;`
`526`	`531`	`return AppendGetThisCS(method.IsStatic, method.DeclaringType);`
`527`	`532`	`}`
`528`	`533`