gremlin 3.5.2 → 3.5.3

package/lib/process/traversal.js

@@ -20,9 +20,9 @@
 /**
  * @author Jorge Bay Gondra
  */
+
 'use strict';
 
-const utils = require('../utils');
 const itemDone = Object.freeze({ value: null, done: true });
 const asyncIteratorSymbol = Symbol.asyncIterator || Symbol('@@asyncIterator');
 
@@ -63,19 +63,21 @@ class Traversal {
       }
       return result;
     });
-  };
+  }
 
   /**
    * Determines if there are any more items to iterate from the traversal.
    * @returns {Promise.<boolean>}
    */
-   hasNext() {
-     return this._applyStrategies().then(() => {
-       return this.traversers && this.traversers.length > 0 &&
-              this._traversersIteratorIndex < this.traversers.length &&
-              this.traversers[this._traversersIteratorIndex].bulk > 0;
-     });
-   }
+  hasNext() {
+    return this._applyStrategies().then(
+      () =>
+        this.traversers &&
+        this.traversers.length > 0 &&
+        this._traversersIteratorIndex < this.traversers.length &&
+        this.traversers[this._traversersIteratorIndex].bulk > 0,
+    );
+  }
 
   /**
    * Iterates all Traverser instances in the traversal.
@@ -86,6 +88,7 @@ class Traversal {
     return this._applyStrategies().then(() => {
       let it;
       while ((it = this._getNext()) && !it.done) {
+        //
       }
     });
   }
@@ -105,7 +108,7 @@ class Traversal {
    */
   _getNext() {
     while (this.traversers && this._traversersIteratorIndex < this.traversers.length) {
-      let traverser = this.traversers[this._traversersIteratorIndex];
+      const traverser = this.traversers[this._traversersIteratorIndex];
       if (traverser.bulk > 0) {
         traverser.bulk--;
         return { value: traverser.object, done: false };
@@ -120,14 +123,14 @@ class Traversal {
       // Apply strategies only once
       return this._traversalStrategiesPromise;
     }
-    return this._traversalStrategiesPromise = this.traversalStrategies.applyStrategies(this);
+    return (this._traversalStrategiesPromise = this.traversalStrategies.applyStrategies(this));
   }
 
   /**
    * Returns step instructions during JSON serialization
    * @returns {Array}
    */
-  toJSON(){
+  toJSON() {
     return this.bytecode.stepInstructions;
   }
 
@@ -137,106 +140,103 @@ class Traversal {
    */
   toString() {
     return this.bytecode.toString();
-  };
+  }
 }
 
-
 class IO {
+  static get graphml() {
+    return 'graphml';
+  }
 
- static get graphml() {
-   return "graphml"
- }
-
- static get graphson() {
-   return "graphson"
- }
+  static get graphson() {
+    return 'graphson';
+  }
 
- static get gryo() {
-   return "gryo"
- }
+  static get gryo() {
+    return 'gryo';
+  }
 
- static get reader() {
-   return "~tinkerpop.io.reader"
- }
+  static get reader() {
+    return '~tinkerpop.io.reader';
+  }
 
- static get registry() {
-   return "~tinkerpop.io.registry"
- }
+  static get registry() {
+    return '~tinkerpop.io.registry';
+  }
 
- static get writer() {
-   return "~tinkerpop.io.writer"
- }
+  static get writer() {
+    return '~tinkerpop.io.writer';
+  }
 }
 
+// eslint-disable-next-line no-unused-vars
 class ConnectedComponent {
+  static get component() {
+    return 'gremlin.connectedComponentVertexProgram.component';
+  }
 
- static get component() {
-   return "gremlin.connectedComponentVertexProgram.component"
- }
-
- static get edges() {
-   return "~tinkerpop.connectedComponent.edges"
- }
+  static get edges() {
+    return '~tinkerpop.connectedComponent.edges';
+  }
 
- static get propertyName() {
-   return "~tinkerpop.connectedComponent.propertyName"
- }
+  static get propertyName() {
+    return '~tinkerpop.connectedComponent.propertyName';
+  }
 }
 
+// eslint-disable-next-line no-unused-vars
 class ShortestPath {
+  static get distance() {
+    return '~tinkerpop.shortestPath.distance';
+  }
 
- static get distance() {
-   return "~tinkerpop.shortestPath.distance"
- }
-
- static get edges() {
-   return "~tinkerpop.shortestPath.edges"
- }
+  static get edges() {
+    return '~tinkerpop.shortestPath.edges';
+  }
 
- static get includeEdges() {
-   return "~tinkerpop.shortestPath.includeEdges"
- }
+  static get includeEdges() {
+    return '~tinkerpop.shortestPath.includeEdges';
+  }
 
- static get maxDistance() {
-   return "~tinkerpop.shortestPath.maxDistance"
- }
+  static get maxDistance() {
+    return '~tinkerpop.shortestPath.maxDistance';
+  }
 
- static get target() {
-   return "~tinkerpop.shortestPath.target"
- }
+  static get target() {
+    return '~tinkerpop.shortestPath.target';
+  }
 }
 
+// eslint-disable-next-line no-unused-vars
 class PageRank {
+  static get edges() {
+    return '~tinkerpop.pageRank.edges';
+  }
 
- static get edges() {
-   return "~tinkerpop.pageRank.edges"
- }
-
- static get propertyName() {
-   return "~tinkerpop.pageRank.propertyName"
- }
+  static get propertyName() {
+    return '~tinkerpop.pageRank.propertyName';
+  }
 
- static get times() {
-   return "~tinkerpop.pageRank.times"
- }
+  static get times() {
+    return '~tinkerpop.pageRank.times';
+  }
 }
 
+// eslint-disable-next-line no-unused-vars
 class PeerPressure {
+  static get edges() {
+    return '~tinkerpop.peerPressure.edges';
+  }
 
- static get edges() {
-   return "~tinkerpop.peerPressure.edges"
- }
-
- static get propertyName() {
-   return "~tinkerpop.peerPressure.propertyName"
- }
+  static get propertyName() {
+    return '~tinkerpop.peerPressure.propertyName';
+  }
 
- static get times() {
-   return "~tinkerpop.peerPressure.times"
- }
+  static get times() {
+    return '~tinkerpop.peerPressure.times';
+  }
 }
 
-
 class P {
   /**
    * Represents an operation.
@@ -253,16 +253,16 @@ class P {
    * @returns {string}
    */
   toString() {
-    function formatValue(value){
+    function formatValue(value) {
       if (Array.isArray(value)) {
-        let acc = [];
+        const acc = [];
         for (const item of value) {
           acc.push(formatValue(item));
         }
         return acc;
       }
-      if (value && typeof value === "string"){
-        return "'" + value + "'";
+      if (value && typeof value === 'string') {
+        return `'${value}'`;
       }
       return value;
     }
@@ -283,21 +283,18 @@ class P {
 
   static within(...args) {
     if (args.length === 1 && Array.isArray(args[0])) {
-      return new P("within", args[0], null);
-    } else {
-      return new P("within", args, null);
+      return new P('within', args[0], null);
     }
+    return new P('within', args, null);
   }
 
   static without(...args) {
     if (args.length === 1 && Array.isArray(args[0])) {
-      return new P("without", args[0], null);
-    } else {
-      return new P("without", args, null);
+      return new P('without', args[0], null);
     }
+    return new P('without', args, null);
   }
 
-
   /** @param {...Object} args */
   static between(...args) {
     return createP('between', args);
@@ -352,12 +349,11 @@ class P {
   static test(...args) {
     return createP('test', args);
   }
-
 }
 
 function createP(operator, args) {
   args.unshift(null, operator);
-  return new (Function.prototype.bind.apply(P, args));
+  return new (Function.prototype.bind.apply(P, args))();
 }
 
 class TextP {
@@ -376,9 +372,9 @@ class TextP {
    * @returns {string}
    */
   toString() {
-    function formatValue(value){
-      if (value && typeof value === "string"){
-        return "'" + value + "'";
+    function formatValue(value) {
+      if (value && typeof value === 'string') {
+        return `'${value}'`;
       }
       return value;
     }
@@ -426,12 +422,11 @@ class TextP {
   static startingWith(...args) {
     return createTextP('startingWith', args);
   }
-
 }
 
 function createTextP(operator, args) {
   args.unshift(null, operator);
-  return new (Function.prototype.bind.apply(TextP, args));
+  return new (Function.prototype.bind.apply(TextP, args))();
 }
 
 class Traverser {
@@ -441,26 +436,24 @@ class Traverser {
   }
 }
 
-class TraversalSideEffects {
-
-}
+class TraversalSideEffects {}
 
 const withOptions = {
-  tokens: "~tinkerpop.valueMap.tokens",
+  tokens: '~tinkerpop.valueMap.tokens',
   none: 0,
   ids: 1,
   labels: 2,
   keys: 4,
   values: 8,
   all: 15,
-  indexer: "~tinkerpop.index.indexer",
+  indexer: '~tinkerpop.index.indexer',
   list: 0,
-  map: 1
+  map: 1,
 };
 
 function toEnum(typeName, keys) {
   const result = {};
-  keys.split(' ').forEach(k => {
+  keys.split(' ').forEach((k) => {
     let jsKey = k;
     if (jsKey === jsKey.toUpperCase()) {
       jsKey = jsKey.toLowerCase();
@@ -501,5 +494,5 @@ module.exports = {
   pick: toEnum('Pick', 'any none'),
   pop: toEnum('Pop', 'all first last mixed'),
   scope: toEnum('Scope', 'global local'),
-  t: toEnum('T', 'id key label value')
+  t: toEnum('T', 'id key label value'),
 };

package/lib/structure/graph.js

@@ -57,7 +57,7 @@ class Element {
    * @returns {boolean}
    */
   equals(other) {
-    return (other instanceof Element) && this.id === other.id;
+    return other instanceof Element && this.id === other.id;
   }
 }
 
@@ -119,7 +119,7 @@ class Property {
   }
 
   equals(other) {
-    return (other instanceof Property) && this.key === other.key && this.value === other.value;
+    return other instanceof Property && this.key === other.key && this.value === other.value;
   }
 }
 
@@ -136,7 +136,7 @@ class Path {
   }
 
   toString() {
-    return `path[${(this.objects || []).join(", ")}]`;
+    return `path[${(this.objects || []).join(', ')}]`;
   }
 
   equals(other) {
@@ -162,7 +162,7 @@ function areEqual(obj1, obj2) {
       return false;
     }
     for (let i = 0; i < obj1.length; i++) {
-      if (!areEqual(obj1[i], obj2[i])){
+      if (!areEqual(obj1[i], obj2[i])) {
         return false;
       }
     }
@@ -186,5 +186,5 @@ module.exports = {
   Path,
   Property,
   Vertex,
-  VertexProperty
+  VertexProperty,
 };

package/lib/structure/io/graph-serializer.js

@@ -23,12 +23,12 @@
 'use strict';
 
 const typeSerializers = require('./type-serializers');
+const Bytecode = require('../../process/bytecode');
 
 /**
  * GraphSON2 writer.
  */
 class GraphSON2Writer {
-
   /**
    * @param {Object} [options]
    * @param {Object} [options.serializers] An object used as an associative array with GraphSON 2 type name as keys and
@@ -38,7 +38,7 @@ class GraphSON2Writer {
   constructor(options) {
     this._options = options || {};
     // Create instance of the default serializers
-    this._serializers = this.getDefaultSerializers().map(serializerConstructor => {
+    this._serializers = this.getDefaultSerializers().map((serializerConstructor) => {
       const s = new serializerConstructor();
       s.writer = this;
       return s;
@@ -46,7 +46,7 @@ class GraphSON2Writer {
 
     const customSerializers = this._options.serializers || {};
 
-    Object.keys(customSerializers).forEach(key => {
+    Object.keys(customSerializers).forEach((key) => {
       const s = customSerializers[key];
       if (!s.serialize) {
         return;
@@ -83,7 +83,7 @@ class GraphSON2Writer {
     if (Array.isArray(value)) {
       // We need to handle arrays when there is no serializer
       // for older versions of GraphSON
-      return value.map(item => this.adaptObject(item));
+      return value.map((item) => this.adaptObject(item));
     }
 
     // Default (strings / objects / ...)
@@ -98,6 +98,48 @@ class GraphSON2Writer {
   write(obj) {
     return JSON.stringify(this.adaptObject(obj));
   }
+
+  writeRequest({ requestId, op, processor, args }) {
+    const req = {
+      requestId: { '@type': 'g:UUID', '@value': requestId },
+      op,
+      processor,
+      args: this._adaptArgs(args, true),
+    };
+
+    if (req.args['gremlin'] instanceof Bytecode) {
+      req.args['gremlin'] = this.adaptObject(req.args['gremlin']);
+    }
+
+    return Buffer.from(JSON.stringify(req));
+  }
+
+  /**
+   * Takes the given args map and ensures all arguments are passed through to adaptObject
+   * @param {Object} args Map of arguments to process.
+   * @param {Boolean} protocolLevel Determines whether it's a protocol level binding.
+   * @returns {Object}
+   * @private
+   */
+  _adaptArgs(args, protocolLevel) {
+    if (args instanceof Object) {
+      const newObj = {};
+      Object.keys(args).forEach((key) => {
+        // bindings key (at the protocol-level needs special handling. without this, it wraps the generated Map
+        // in another map for types like EnumValue. Could be a nicer way to do this but for now it's solving the
+        // problem with script submission of non JSON native types
+        if (protocolLevel && key === 'bindings') {
+          newObj[key] = this._adaptArgs(args[key], false);
+        } else {
+          newObj[key] = this.adaptObject(args[key]);
+        }
+      });
+
+      return newObj;
+    }
+
+    return args;
+  }
 }
 
 /**
@@ -125,7 +167,7 @@ class GraphSON2Reader {
     this._deserializers = {};
 
     const defaultDeserializers = this.getDefaultDeserializers();
-    Object.keys(defaultDeserializers).forEach(typeName => {
+    Object.keys(defaultDeserializers).forEach((typeName) => {
       const serializerConstructor = defaultDeserializers[typeName];
       const s = new serializerConstructor();
       s.reader = this;
@@ -134,7 +176,7 @@ class GraphSON2Reader {
 
     if (this._options.serializers) {
       const customSerializers = this._options.serializers || {};
-      Object.keys(customSerializers).forEach(key => {
+      Object.keys(customSerializers).forEach((key) => {
         const s = customSerializers[key];
         if (!s.deserialize) {
           return;
@@ -161,7 +203,7 @@ class GraphSON2Reader {
       return null;
     }
     if (Array.isArray(obj)) {
-      return obj.map(item => this.read(item));
+      return obj.map((item) => this.read(item));
     }
     const type = obj[typeSerializers.typeKey];
     if (type) {
@@ -179,6 +221,10 @@ class GraphSON2Reader {
     return obj;
   }
 
+  readResponse(buffer) {
+    return this.read(JSON.parse(buffer.toString()));
+  }
+
   _deserializeObject(obj) {
     const keys = Object.keys(obj);
     const result = {};
@@ -201,9 +247,9 @@ class GraphSON3Reader extends GraphSON2Reader {
 const graphSON2Deserializers = {
   'g:Traverser': typeSerializers.TraverserSerializer,
   'g:TraversalStrategy': typeSerializers.TraversalStrategySerializer,
-  'g:Int32':  typeSerializers.NumberSerializer,
-  'g:Int64':  typeSerializers.NumberSerializer,
-  'g:Float':  typeSerializers.NumberSerializer,
+  'g:Int32': typeSerializers.NumberSerializer,
+  'g:Int64': typeSerializers.NumberSerializer,
+  'g:Float': typeSerializers.NumberSerializer,
   'g:Double': typeSerializers.NumberSerializer,
   'g:Date': typeSerializers.DateSerializer,
   'g:Direction': typeSerializers.DirectionSerializer,
@@ -214,13 +260,13 @@ const graphSON2Deserializers = {
   'g:Path': typeSerializers.Path3Serializer,
   'g:TextP': typeSerializers.TextPSerializer,
   'g:T': typeSerializers.TSerializer,
-  'g:BulkSet': typeSerializers.BulkSetSerializer
+  'g:BulkSet': typeSerializers.BulkSetSerializer,
 };
 
 const graphSON3Deserializers = Object.assign({}, graphSON2Deserializers, {
   'g:List': typeSerializers.ListSerializer,
   'g:Set': typeSerializers.SetSerializer,
-  'g:Map': typeSerializers.MapSerializer
+  'g:Map': typeSerializers.MapSerializer,
 });
 
 const graphSON2Serializers = [
@@ -235,13 +281,13 @@ const graphSON2Serializers = [
   typeSerializers.EnumSerializer,
   typeSerializers.VertexSerializer,
   typeSerializers.EdgeSerializer,
-  typeSerializers.LongSerializer
+  typeSerializers.LongSerializer,
 ];
 
 const graphSON3Serializers = graphSON2Serializers.concat([
   typeSerializers.ListSerializer,
   typeSerializers.SetSerializer,
-  typeSerializers.MapSerializer
+  typeSerializers.MapSerializer,
 ]);
 
 module.exports = {
@@ -250,5 +296,5 @@ module.exports = {
   GraphSON2Writer,
   GraphSON2Reader,
   GraphSONWriter: GraphSON3Writer,
-  GraphSONReader: GraphSON3Reader
-};
+  GraphSONReader: GraphSON3Reader,
+};