Upgrade quickjs version to 2024-0214

README.md

@@ -5,7 +5,6 @@ QuickJS wrapper for Android/JVM.
 - Java types are supported with JavaScript
 - Support promise execute
 - JavaScript exception handler
-- Optimize not a function with its name when type error
 - Compile bytecode
 
 Experimental Features Stability not guaranteed.

wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSModuleTest.java

@@ -45,7 +45,7 @@ public String getModuleStringCode(String moduleName) {
                 "assertAge(age);\n" +
                 "new Promise((resolve, reject) => { name = 'Updated'; }).catch((res) => { assertNameUpdated(res); });");
 
-        assertNull(ret);
+        assertEquals(ret.toString(), "[object Promise]");
 
         context.destroy();
     }

wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSTest.java

@@ -454,183 +454,6 @@ public void testCreateNewJSArray() {
         context.destroy();
     }
 
-    @Test
-    public void testNotAFunction() {
-        QuickJSContext context = createContext();
-        try {
-            context.evaluate("var a = 1; a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'a' is not a function"));
-        }
-
-        context.destroy();
-    }
-
-    @Test
-    public void testNotAFunction2() {
-        QuickJSContext context = createContext();
-        try {
-            context.evaluate("function a() {\n" +
-                    "\tvar b = {};\n" +
-                    "\tb();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'b' is not a function"));
-        }
-
-
-        try {
-            context.evaluate("function a() {\n" +
-                    "\tvar b = {}; var d = 1;\n" +
-                    "\td();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'d' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a() {\n" +
-                    "\tvar b = {}; var d = 1; var c = 1;\n" +
-                    "\tc();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'c' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a() {\n" +
-                    "\tvar b = {}; var d = 1; var c = 1;var d = [];\n" +
-                    "\td();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'d' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a() {\n" +
-                    "\tvar b = {}; var d = 1; var c = 1;var d = []; var e = {};\n" +
-                    "\te();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'e' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a(aa) {\n" +
-                    "\taa();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'aa' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a(aa, bb) {\n" +
-                    "\tbb();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'bb' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a(aa, bb, cc) {\n" +
-                    "\tcc();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'cc' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a(aa, bb, cc, dd) {\n" +
-                    "\tdd();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'dd' is not a function"));
-        }
-
-        try {
-            context.evaluate("function a(aa, bb, cc, dd, ee) {\n" +
-                    "\tee();\n" +
-                    "}\n" +
-                    "a();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'ee' is not a function"));
-        }
-
-        try {
-            context.evaluate("function test (){var a = {}; function test1 () {a(); } test1();} test();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'a' is not a function"));
-        }
-
-        try {
-            context.evaluate("var a = {}; a.b();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'b' is not a function"));
-        }
-
-        try {
-            context.evaluate("function test (){var a = {}; var b = 1;var c = 1; var d = 1; var e = 1; function test1 () {b = a; c = a; d = e; c = b;e(); } test1();} test();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'e' is not a function"));
-        }
-
-        try {
-            context.evaluate("[1, 2].atIndex(0);");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'atIndex' is not a function"));
-        }
-
-        try {
-            context.evaluate("var C={index:function(e){\n" +
-                    "\tfunction t(){\n" +
-                    "\t \tvar e = {router: {}};\n" +
-                    "\t\te.router.navigsateTo(\"1\")\n" +
-                    "\t}\n" +
-                    "\tfor(var n=arguments.length,r=new Array(n>1?n-1:0),o=1;o<n;o++)\n" +
-                    "\tr[o-1]=arguments[o]\n" +
-                    "\treturn t.apply(null,r);\n" +
-                    "}};\n" +
-                    "\n" +
-                    "C.index();");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'navigsateTo' is not a function"));
-        }
-
-        try {
-            context.evaluate("'aa'.splice(0, 1)");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'aa.splice' is not a function"));
-        }
-
-        try {
-            context.evaluate("const assert = {}; const format22 = () => {};assert.match(format22(), 123);");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'assert.match' is not a function"));
-        }
-
-        context.destroy();
-    }
-
-    @Test
-    public void testNotAFunctionInPromise() {
-        QuickJSContext context = createContext();
-        try {
-            context.evaluate("new Promise({name: 'a'});");
-        } catch (QuickJSException e) {
-            assertTrue(e.toString().contains("'[object Object]' is not a function"));
-        }
-        context.destroy();
-    }
-
     @Test
     public void testStackOverflowWithStackSize() {
         QuickJSContext context = createContext();

wrapper-java/src/main/CMakeLists.txt

@@ -16,4 +16,5 @@ add_library( # Sets the name of the library.
 
 
 include_directories($ENV{JAVA_HOME}/include/)
-include_directories($ENV{JAVA_HOME}/include/darwin)
+include_directories($ENV{JAVA_HOME}/include/darwin)
+include_directories($ENV{JAVA_HOME}/include/linux)