JSValueTest

Author: Wiki

quickjs-android/src/androidTest/java/com/quickjs/android/JSObjectTest.java

@@ -224,4 +224,16 @@ public void console() {
  context.set("console", console);
  context.executeVoidScript("console.log('Hello')", "file.js");
  }
+
+ @Test
+ public void getType() {
+ context.set("key1", "1");
+ context.set("key2", 1);
+ context.set("key3", true);
+ context.set("key4", 1.1);
+ assertEquals(JSValue.TYPE_STRING, context.getType("key1"));
+ assertEquals(JSValue.TYPE_INTEGER, context.getType("key2"));
+ assertEquals(JSValue.TYPE_BOOLEAN, context.getType("key3"));
+ assertEquals(JSValue.TYPE_DOUBLE, context.getType("key4"));
+ }
 }

quickjs-android/src/main/cpp/quickjs-jni.cpp

@@ -310,7 +310,16 @@ Java_com_quickjs_android_QuickJS__1get(JNIEnv *env, jclass clazz, jlong context_
  JSValue result = JS_GetPropertyStr(ctx, this_obj, key_);
  return To_JObject(env, context_ptr, expected_type, result);
 }
-
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_quickjs_android_QuickJS__1getValue(JNIEnv *env, jclass clazz, jlong context_ptr,
+ jobject object_handle, jstring key) {
+ const char *key_ = env->GetStringUTFChars(key, nullptr);
+ auto *ctx = reinterpret_cast<JSContext *>(context_ptr);
+ JSValue this_obj = TO_JS_VALUE(env, object_handle);
+ JSValue result = JS_GetPropertyStr(ctx, this_obj, key_);
+ return TO_JAVA_OBJECT(env, ctx, result);
+}
 
 
 

quickjs-android/src/main/java/com/quickjs/android/JSObject.java

@@ -101,9 +101,11 @@ public JSObject getObject(String key) {
 
 
  public int getType(String key) {
- // TODO
-// long ptr = QuickJS._getObject(this.getContextPtr(), this, key);
- return QuickJS._getObjectType(this.getContextPtr(), this);
+ JSValue value = QuickJS._getValue(this.getContextPtr(), this, key);
+ if (value == null) {
+ return JSValue.TYPE_NULL;
+ }
+ return value.getJSType();
  }
 
 
@@ -190,4 +192,36 @@ public String[] getKeys() {
  Object executeFunction(int expectedType, String name, JSArray parameters) {
  return QuickJS._executeFunction(context.getContextPtr(), expectedType, this, name, parameters);
  }
+
+ static class Undefined extends JSObject {
+
+ Undefined(JSContext context, long tag, int u_int32, double u_float64, long u_ptr) {
+ super(context, tag, u_int32, u_float64, u_ptr);
+ }
+
+ @Override
+ JSObject setObject(String key, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ Object get(int expectedType, String key) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public JSObject registerJavaMethod(JavaCallback callback, String jsFunctionName) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public JSObject registerJavaMethod(JavaVoidCallback callback, String jsFunctionName) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ Object executeFunction(int expectedType, String name, JSArray parameters) {
+ throw new UnsupportedOperationException();
+ }
+ }
 }

quickjs-android/src/main/java/com/quickjs/android/QuickJS.java

@@ -75,7 +75,7 @@ static JSValue createJSValue(long contextPtr, int type, long tag, int u_int32, d
  return new JSArray(context, tag, u_int32, u_float64, u_ptr);
  case JSValue.TYPE_JS_OBJECT:
  case JSValue.TYPE_UNDEFINED:
- return new JSObject(context, tag, u_int32, u_float64, u_ptr);
+ return new JSObject.Undefined(context, tag, u_int32, u_float64, u_ptr);
  default:
  return new JSValue(context, tag, u_int32, u_float64, u_ptr);
  }
@@ -147,6 +147,8 @@ static Object executeJSFunction(JSContext context, JSValue objectHandle, String
 
  native static JSValue _Undefined(long contextPtr);
 
+ native static JSValue _getValue(long contextPtr, JSObject jsObject, String key);
+
 
  static {
  System.loadLibrary("quickjs");