This is an automated email from the ASF dual-hosted git repository. jorgebg pushed a commit to branch 3.4-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a6dc04581a3a8b1dfdbb98ac56ecb8c5bf210e96 Merge: f56292b ea91070 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> AuthorDate: Mon Jan 27 15:34:32 2020 +0100 Merge branch '3.3-dev' into 3.4-dev .../main/javascript/gremlin-javascript/index.js | 5 +- .../gremlin-javascript/lib/driver/connection.js | 29 +++++-- .../lib/structure/io/graph-serializer.js | 88 +++++++++++++++++----- .../gremlin-javascript/test/unit/client-test.js | 4 +- .../gremlin-javascript/test/unit/exports-test.js | 6 ++ 5 files changed, 101 insertions(+), 31 deletions(-) diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/index.js index a9d5c97,5ef0eca..87f9842 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js @@@ -78,14 -77,10 +78,11 @@@ module.exports = statics: gt.statics, Translator, traversal: AnonymousTraversalSource.traversal, - AnonymousTraversalSource + AnonymousTraversalSource, + withOptions: t.withOptions }, structure: { - io: { - GraphSONReader: gs.GraphSONReader, - GraphSONWriter: gs.GraphSONWriter - }, + io: gs, Edge: graph.Edge, Graph: graph.Graph, Path: graph.Path, diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js index 7943852,fb461d9..122f315 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js @@@ -169,15 -211,16 +212,18 @@@ const graphSON2Deserializers = 'g:VertexProperty': typeSerializers.VertexPropertySerializer, 'g:Property': typeSerializers.PropertySerializer, 'g:Path': typeSerializers.Path3Serializer, - 'g:T': typeSerializers.TSerializer, - 'g:T': typeSerializers.TSerializer + 'g:TextP': typeSerializers.TextPSerializer, - 'g:List': typeSerializers.ListSerializer, - 'g:Set': typeSerializers.SetSerializer, - 'g:Map': typeSerializers.MapSerializer, ++ 'g:T': typeSerializers.TSerializer, + 'g:BulkSet': typeSerializers.BulkSetSerializer }; - const serializers = [ + const graphSON3Deserializers = Object.assign({}, graphSON2Deserializers, { + 'g:List': typeSerializers.ListSerializer, + 'g:Set': typeSerializers.SetSerializer, + 'g:Map': typeSerializers.MapSerializer + }); + + const graphSON2Serializers = [ typeSerializers.NumberSerializer, typeSerializers.DateSerializer, typeSerializers.BytecodeSerializer,