Fix elementMap serialization

Expose tokens in a similar way as the GLV.

Author: jorgebay

lib/datastax/graph/index.d.ts

@@ -71,4 +71,15 @@ export namespace graph {
   function asTimestamp(value: Date): object;
 
   function asUdt(value: object): object;
+
+  interface EnumValue {
+    toString(): string
+  }
+
+  namespace t {
+    const id: EnumValue;
+    const key: EnumValue;
+    const label: EnumValue;
+    const value: EnumValue;
+  }
 }

lib/datastax/graph/index.js

@@ -25,6 +25,27 @@ const getCustomTypeSerializers = require('./custom-type-serializers');
 const { asInt, asDouble, asFloat, asTimestamp, asUdt, UdtGraphWrapper, GraphTypeWrapper} = require('./wrappers');
 const { Edge, Element, Path, Property, Vertex, VertexProperty } = require('./structure');
 
+class EnumValue {
+  constructor(typeName, elementName) {
+    this.typeName = typeName;
+    this.elementName = elementName;
+  }
+
+  toString() {
+    return this.elementName;
+  }
+}
+
+/**
+ * Represents a collection of tokens for more concise Traversal definitions.
+ */
+const t = {
+  id: new EnumValue('T', 'id'),
+  key: new EnumValue('T', 'key'),
+  label: new EnumValue('T', 'label'),
+  value: new EnumValue('T', 'value'),
+};
+
 module.exports = {
   Edge,
   Element,
@@ -41,5 +62,6 @@ module.exports = {
   getCustomTypeSerializers,
   GraphResultSet,
   GraphTypeWrapper,
+  t,
   UdtGraphWrapper
 };

lib/datastax/graph/type-serializers.js

@@ -30,12 +30,13 @@
 // Replace dependencies to minimize code changes from Apache TinkerPop
 const t = {
   P: UnsupportedType, TextP: UnsupportedType, Traversal: UnsupportedType, Traverser: UnsupportedType,
-  EnumValue: UnsupportedType, t: {}, direction: {}
+  EnumValue: UnsupportedType, direction: {}
 };
 const ts = { TraversalStrategy: UnsupportedType };
 const Bytecode = UnsupportedType;
 const g = require('./index');
 const utils = { Long: UnsupportedType };
+t.t = g.t;
 
 function UnsupportedType() { }
 

test/integration/short/graph/graph-tests.js

@@ -28,7 +28,7 @@ const { InetAddress, Uuid, Tuple } = types;
 const ExecutionProfile = require('../../../../lib/execution-profile').ExecutionProfile;
 const utils = require('../../../../lib/utils');
 const graphModule = require('../../../../lib/datastax/graph');
-const { asInt, asFloat, asUdt } = graphModule;
+const { asInt, asFloat, asUdt, t } = graphModule;
 const { graphProtocol } = require('../../../../lib/datastax/graph/options');
 const graphTestHelper = require('./graph-test-helper');
 
@@ -948,6 +948,20 @@ vdescribe('dse-5.0', 'Client @SERVER_API', function () {
         assert.deepEqual(rs.toArray(), [value]);
       });
 
+      it('should support elementMap() tokens', async () => {
+        const id = schemaCounter++;
+        const insertTraversal = `g.addV('label_test').property('id', ${id}).property('prop_text', 'sample')`;
+        await client.executeGraph(insertTraversal, null, { graphName });
+
+        const traversalText = `g.V().has('label_test', 'id', ${id}).elementMap()`;
+        const rs = await client.executeGraph(traversalText, null, { graphName });
+        const map = rs.first();
+        assert.strictEqual(map.get('id'), id);
+        assert.strictEqual(map.get('prop_text'), 'sample');
+        assert.strictEqual(typeof map.get(t.id), 'string');
+        assert.strictEqual(map.get(t.label), 'label_test');
+      });
+
       context('with complex types', () => {
         before(() => {
           const createSchemaQuery = `

test/unit/api-tests.js

@@ -74,6 +74,21 @@ describe('API', function () {
     assert.isObject(api.datastax.graph.getCustomTypeSerializers()['dse:Tuple']);
   });
 
+  it('should expose graph tokens', () => {
+    [
+      'id',
+      'key',
+      'label',
+      'value'
+    ].forEach(name => {
+      assert.isObject(api.datastax.graph.t[name]);
+      assert.equal(api.datastax.graph.t[name].toString(), name);
+    });
+
+    checkConstructor(api.datastax.graph, 'UdtGraphWrapper');
+    checkConstructor(api.datastax.graph, 'GraphTypeWrapper');
+  });
+
   it('should expose cassandra driver modules', function () {
     assert.ok(api.errors);
     assert.ok(api.policies);

test/unit/typescript/graph-tests.ts

@@ -35,4 +35,8 @@ async function myTest(client: Client): Promise<any> {
   await client.executeGraph('g.V()', cb);
   await client.executeGraph('g.V(id)', { id: 1}, cb);
   await client.executeGraph('g.V()', {}, { executionProfile: 'ep1' }, cb);
+
+  let tokenString: string;
+  tokenString = datastax.graph.t.id.toString();
+  tokenString = datastax.graph.t.label.toString();
 }