Repro for issue with sending arrays into the javascript engine.

dpwhittaker · Sep 6, 2017 · e4d020d · e4d020d
1 parent 7c86e4f
commit e4d020d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/Tests/TestEspressoCore/Tests/Test1.cs b/Tests/TestEspressoCore/Tests/Test1.cs
@@ -1,7 +1,7 @@
 //MIT, 2015-2017, WinterDev, EngineKit, brezza92
 using System;
 using Espresso;
-
+
 namespace TestEspressoCore
 {
     public class Test1
@@ -95,5 +95,30 @@ static void TestCase2()
                 //Assert.That(result, Is.EqualTo(100)); 
             }
         }
+        [Test("3", "TestColl1")]
+        static void TestColl1()
+        {
+#if DEBUG
+            JsBridge.dbugTestCallbacks();
+#endif
+            //create js engine and context
+
+            using (JsEngine engine = new JsEngine())
+            using (JsContext ctx = engine.CreateContext())
+            {
+                GC.Collect();
+                System.Diagnostics.Stopwatch stwatch = new System.Diagnostics.Stopwatch();
+                stwatch.Start();
+
+                string[] ta = { "test" };
+                ctx.SetVariableFromAny("ta", ta);
+                object result = ctx.Execute("(function(){return JSON.stringify(ta);})()");
+                if ((string)result != ta[0]) throw new Exception("It should return the first element");
+
+                stwatch.Stop();
+                Console.WriteLine("met2 managed reflection:" + stwatch.ElapsedMilliseconds.ToString());
+                //Assert.That(result, Is.EqualTo(100)); 
+            }
+        }
     }
 }
diff --git a/src/1_Core/JsConvert.cs b/src/1_Core/JsConvert.cs
@@ -502,7 +502,11 @@ public void AnyToJsValue(object obj, ref JsValue output)
                     JsValue** jsarr = (JsValue**)output.Ptr;
                     for (int i = 0; i < arrLen; i++)
                     {
-                        AnyToJsValuePtr(array[i], jsarr[i]);
+                        //AnyToJsValuePtr(array[i], jsarr[i]);
+                        JsValue entry = new JsValue();
+                        AnyToJsValue(array[i], ref entry);
+                        jsarr[i] = &entry;
+                        _context.KeepAliveAdd(entry);
                     }
                 }
                 return;
@@ -544,7 +548,7 @@ public unsafe void AnyToJsValuePtr(object obj, JsValue* output)
             //-----
             Type type = obj.GetType();
             // Check for nullable types (we will cast the value out of the box later). 
-            type = type.ExtGetInnerTypeIfNullableValue();
+            type = type.ExtGetInnerTypeIfNullableValue() ?? type;
             if (type == typeof(Boolean))
             {
                 output->Type = JsValueType.Boolean;