.

beyaz · Dec 5, 2024 · e80e1e0 · e80e1e0
1 parent a5633a4
commit e80e1e0
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 19 deletions.
diff --git a/ReactWithDotNet/ILCodeGeneration/MetadataHelper.cs b/ReactWithDotNet/ILCodeGeneration/MetadataHelper.cs
@@ -44,7 +44,7 @@ sealed record MetadataResponse
 {
     public string ErrorMessage { get; init; }
     public MetadataTable Metadata { get; init; }
-    public bool Success { get; init; }
+    public int Success { get; init; }
 }
 
 static partial class Mixin
@@ -219,7 +219,7 @@ static MetadataResponse GetMetadata(IEnumerable<MetadataRequest.Item> requests,
 
         return new()
         {
-            Success  = true,
+            Success  = 1,
             Metadata = metadataTable
         };
     }

diff --git a/ReactWithDotNet/ILCodeGeneration/Models.generated.cs b/ReactWithDotNet/ILCodeGeneration/Models.generated.cs
@@ -205,5 +205,5 @@ sealed record GenericInstanceMethodModel : MethodReferenceModel
 
     public required IReadOnlyList<int> GenericArguments { get; init; }
 
-    public required bool IsGenericInstance;
+    public required int IsGenericInstance;
 }
diff --git a/ReactWithDotNet/ILCodeGeneration/MonoCecilToJsonModelMapper.cs b/ReactWithDotNet/ILCodeGeneration/MonoCecilToJsonModelMapper.cs
@@ -486,7 +486,7 @@ static MethodReferenceModel AsModel(this MethodReference methodReference, Metada
         {
             return new GenericInstanceMethodModel
             {
-                IsGenericInstance = genericInstanceMethod.IsGenericInstance,
+                IsGenericInstance = 1,
 
                 ElementMethod    = genericInstanceMethod.ElementMethod.IndexAt(metadataTable),
                 GenericArguments = genericInstanceMethod.GenericArguments.ToListOf(x => x.IndexAt(metadataTable)),

diff --git a/ReactWithDotNet/JsClientEngine/clr.js b/ReactWithDotNet/JsClientEngine/clr.js
@@ -11,11 +11,7 @@
  */
 
 /**
- * @typedef {Object} TypeReferenceModel
- * @property {string} Name
- * @property {number | null} DeclaringType
- * @property {number} IsDefinition
- * 
+ * @typedef {MemberReference} TypeReferenceModel
  * @property {string} Namespace
  * @property {number} Scope
  * @property {number} IsValueType
@@ -30,6 +26,16 @@
  * 
  */
 
+/**
+ * @typedef {TypeReferenceModel} TypeDefinitionModel
+ * @property {number} BaseType
+ * @property {number} Methods
+ * @property {number} Fields
+ * @property {number} Properties
+ * @property {number} NestedTypes
+ * @property {number} Events
+ */
+
 
 /**
  * @enum {number}
@@ -52,12 +58,57 @@ const ExceptionHandlerType =
  * @property {ExceptionHandlerType} HandlerType
  */
 
+
+/**
+ * @typedef {Object} MethodBodyModel
+ * @property {number[]} Instructions
+ * @property {Object[]} Operands
+ * @property {ExceptionHandler[]} ExceptionHandlers
+ */
+
+
+/**
+ * @typedef {Object} ParameterDefinitionModel
+ * @property {number} Index
+ * @property {string} Name
+ * @property {number} ParameterType
+ */
+
+
+/**
+ * @typedef {Object} MethodReferenceModel
+ * @property {number} ReturnType
+ * @property {ParameterDefinitionModel[]} Parameters
+ */
+
+/**
+ * @typedef {Object} CustomAttributeModel
+ * @property {number} ReturnType
+ * @property {Object[]} Parameters
+ */
+
+/**
+ * @typedef {Object} MethodDefinitionModel
+ * @property {MethodBodyModel} Body
+ * @property {CustomAttributeModel[]} CustomAttributes
+ * @property {number} IsStatic
+ * @property {number} IsConstructor
+ */
+
+
+/**
+ * @typedef {Object} GenericInstanceMethodModel
+ * @property {number} ElementMethod
+ * @property {number[]} GenericArguments
+ * @property {number} IsGenericInstance
+ */
+
 /**
  * @typedef {Object} Metadata
  * @property {MetadataScopeModel[]} MetadataScopes
- * @property {MemberReference[]} Types
+ * @property {Array<TypeReferenceModel>} Types
  * @property {MemberReference[]} Fields
- * @property {MemberReference[]} Methods
+ * @property {Array<MethodDefinitionModel | MethodReferenceModel | GenericInstanceMethodModel>} Methods
  * @property {MemberReference[]} Properties
  * @property {MemberReference[]} Events
  */
@@ -3085,7 +3136,7 @@ function Interpret(thread)
                     query.MethodName = methodReference.Name;
                     function onSuccess(response)
                     {
-                        if (response.Success === false)
+                        if (response.Success === 0)
                         {
                             throw response.ErrorMessage;
                         }
@@ -3096,6 +3147,10 @@ function Interpret(thread)
 
                         Interpret(thread);
                     }
+                    function onFail(exception)
+                    {
+                        throw exception;
+                    }
 
                     let request =
                     {
@@ -3106,7 +3161,7 @@ function Interpret(thread)
                         ]
                     };
 
-                    GetMetadata(request, onSuccess);
+                    GetMetadata(request, onSuccess, onFail);
 
                     thread.IsSuspended = 1;
 
@@ -3128,7 +3183,7 @@ function Interpret(thread)
 
                     GetMetadata(request, response =>
                     {
-                        if (response.Success === false)
+                        if (response.Success === 0)
                         {
                             throw response.ErrorMessage;
                         }
@@ -3138,7 +3193,7 @@ function Interpret(thread)
                         thread.IsSuspended = 0;
 
                         Interpret(thread);
-                    });
+                    }, e=>throw e);
 
                     thread.IsSuspended = 1;
 
@@ -3222,6 +3277,11 @@ function SerializeTypeReference(typeReference)
     }
 }
 
+/**
+ * @param request
+ * @param {(response: MetadataResponse) => void} onSuccess
+ * @param {(e: Error) => void} onFail
+ */
 function GetMetadata(request, onSuccess, onFail)
 {
     const url = "/GetMetadata";
@@ -3279,16 +3339,28 @@ function CallManagedStaticMethod(methodDefinition, args, success, fail)
     }
 }
 
+/**
+ * @typedef {Object} MetadataResponse
+ * @property {string | null} ErrorMessage
+ * @property {Metadata | null} Metadata
+ * @property {number} Success
+ */
+
 setTimeout(function () 
 {
+    /**
+     * @param {MetadataResponse} response
+     */
     function onSuccess(response)
-    {
-
-        if (response.Success === false)
+    {        
+        if (response.Success === 0)
         {
             throw response.ErrorMessage;
         }
-
+
+        /**
+         * @type {Metadata}
+         */
         let metadataTable = response.Metadata;
 
         TryInitialize_InterpreterBridge(metadataTable);