nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Util.Js: Improve JSC Value to GLib.Variant conversion

Browse source 
Stop needlessly wrapping object members and array elements in
variant variants.

Don't wrap object values in variants since the code is already using
vardicts for these. Return a variant array if a JS array contains values
of all the same type and don't wrap these in variants, else return
a tuple, which don't need to be wrapped either.
This commit is contained in:
Michael Gratton 2020-08-28 11:20:27 +10:00 • committed by Michael James Gratton
parent 6162785d99
commit 89453931bf
2 changed files with 143 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/client/util/util-js-test.vala
View file

@ -1,5 +1,5 @@
/*
* Copyright 2017 Michael Gratton <mike@vee.net>
* Copyright © 2017-2020 Michael Gratton <mike@vee.net>
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
@ -61,15 +61,35 @@ public class Util.JS.Test : TestCase {
var value = new JSC.Value.array_from_garray(this.context, null);
assert_equal(
value_to_variant(value).print(true),
"@av []"
"()"
);
var array = new GLib.GenericArray<JSC.Value>();
array.add(new JSC.Value.string(this.context, "test"));
value = new JSC.Value.array_from_garray(this.context, array);
assert_equal(
value_to_variant(value).print(true),
"[<'test'>]"
"['test']"
);
array = new GLib.GenericArray<JSC.Value>();
array.add(new JSC.Value.string(this.context, "test1"));
array.add(new JSC.Value.string(this.context, "test2"));
value = new JSC.Value.array_from_garray(this.context, array);
assert_equal(
value_to_variant(value).print(true),
"['test1', 'test2']"
);
array = new GLib.GenericArray<JSC.Value>();
array.add(new JSC.Value.string(this.context, "test"));
array.add(new JSC.Value.boolean(this.context, true));
value = new JSC.Value.array_from_garray(this.context, array);
assert_equal(
value_to_variant(value).print(true),
"('test', true)"
);
value = new JSC.Value.object(this.context, null, null);
assert_equal(
value_to_variant(value).print(true),
@ -80,7 +100,7 @@ public class Util.JS.Test : TestCase {
);
assert_equal(
value_to_variant(value).print(true),
"{'test': <<true>>}"
"{'test': <true>}"
);
}