nyne/flutter_qjs
1
0
Fork 0
mirror of https://github.com/wgh136/flutter_qjs.git synced 2025-09-27 13:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

add call method to JSInvokable;

Browse Source 
Convert js object to dart Map<String, dynamic>
This commit is contained in:
wgh19
2024-04-20 17:56:36 +08:00
parent 9ecfe2bf6c
commit 67dd0dff9b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/object.dart
View File

@@ -11,6 +11,8 @@ part of '../flutter_qjs.dart';
abstract class JSInvokable extends JSRef { abstract class JSInvokable extends JSRef {
dynamic invoke(List args, [dynamic thisVal]); dynamic invoke(List args, [dynamic thisVal]);
dynamic call(List args) => invoke(args);
static dynamic _wrap(dynamic func) { static dynamic _wrap(dynamic func) {
return func is JSInvokable return func is JSInvokable
? func ? func
@@ -188,6 +190,9 @@ class _JSFunction extends _JSObject implements JSInvokable, _IsolateEncodable {
Map _encode() { Map _encode() {
return IsolateFunction._new(this)._encode(); return IsolateFunction._new(this)._encode();
} }
@override
call(List<dynamic> args) => invoke(args);
} }
/// Dart function wrapper for isolate /// Dart function wrapper for isolate

7
lib/src/wrapper.dart
View File

@@ -197,7 +197,8 @@ dynamic _jsToDart(Pointer<JSContext> ctx, Pointer<JSValue> val,
}, },
(e) { (e) {
JSRef.dupRecursive(e); JSRef.dupRecursive(e);
if (!completer.isCompleted) completer.completeError(e); // `throw null` is allowed in js
if (!completer.isCompleted) completer.completeError(e ?? "null");
}, },
], jsPromise); ], jsPromise);
jsPromise.free(); jsPromise.free();
@@ -227,13 +228,13 @@ dynamic _jsToDart(Pointer<JSContext> ctx, Pointer<JSValue> val,
} }
final len = plen.value; final len = plen.value;
malloc.free(plen); malloc.free(plen);
final ret = Map(); final ret = Map<String, dynamic>();
cache[valptr] = ret; cache[valptr] = ret;
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
final jsAtom = jsPropertyEnumGetAtom(ptab.value, i); final jsAtom = jsPropertyEnumGetAtom(ptab.value, i);
final jsAtomValue = jsAtomToValue(ctx, jsAtom); final jsAtomValue = jsAtomToValue(ctx, jsAtom);
final jsProp = jsGetProperty(ctx, val, jsAtom); final jsProp = jsGetProperty(ctx, val, jsAtom);
ret[_jsToDart(ctx, jsAtomValue, cache: cache)] = ret[_jsToDart(ctx, jsAtomValue, cache: cache).toString()] =
_jsToDart(ctx, jsProp, cache: cache); _jsToDart(ctx, jsProp, cache: cache);
jsFreeValue(ctx, jsAtomValue); jsFreeValue(ctx, jsAtomValue);
jsFreeValue(ctx, jsProp); jsFreeValue(ctx, jsProp);