Merge branch '3.7-dev' into 3.8-dev

Author: kenhuuu

gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js

@@ -1762,6 +1762,7 @@ const statics = {
   as: (...args) => callOnEmptyTraversal('as', args),
   asBool: (...args) => callOnEmptyTraversal('asBool', args),
   asDate: (...args) => callOnEmptyTraversal('asDate', args),
+  asNumber: (...args) => callOnEmptyTraversal('asNumber', args),
   asString: (...args) => callOnEmptyTraversal('asString', args),
   barrier: (...args) => callOnEmptyTraversal('barrier', args),
   both: (...args) => callOnEmptyTraversal('both', args),
@@ -1773,13 +1774,16 @@ const statics = {
   choose: (...args) => callOnEmptyTraversal('choose', args),
   coalesce: (...args) => callOnEmptyTraversal('coalesce', args),
   coin: (...args) => callOnEmptyTraversal('coin', args),
+  combine: (...args) => callOnEmptyTraversal('combine', args),
   concat: (...args) => callOnEmptyTraversal('concat', args),
+  conjoin: (...args) => callOnEmptyTraversal('conjoin', args),
   constant: (...args) => callOnEmptyTraversal('constant', args),
   count: (...args) => callOnEmptyTraversal('count', args),
   cyclicPath: (...args) => callOnEmptyTraversal('cyclicPath', args),
   dateAdd: (...args) => callOnEmptyTraversal('dateAdd', args),
   dateDiff: (...args) => callOnEmptyTraversal('dateDiff', args),
   dedup: (...args) => callOnEmptyTraversal('dedup', args),
+  difference: (...args) => callOnEmptyTraversal('difference', args),
   discard: (...args) => callOnEmptyTraversal('discard', args),
   disjunct: (...args) => callOnEmptyTraversal('disjunct', args),
   drop: (...args) => callOnEmptyTraversal('drop', args),
@@ -1806,6 +1810,7 @@ const statics = {
   inV: (...args) => callOnEmptyTraversal('inV', args),
   index: (...args) => callOnEmptyTraversal('index', args),
   inject: (...args) => callOnEmptyTraversal('inject', args),
+  intersect: (...args) => callOnEmptyTraversal('intersect', args),
   is: (...args) => callOnEmptyTraversal('is', args),
   key: (...args) => callOnEmptyTraversal('key', args),
   label: (...args) => callOnEmptyTraversal('label', args),
@@ -1819,6 +1824,7 @@ const statics = {
   math: (...args) => callOnEmptyTraversal('math', args),
   max: (...args) => callOnEmptyTraversal('max', args),
   mean: (...args) => callOnEmptyTraversal('mean', args),
+  merge: (...args) => callOnEmptyTraversal('merge', args),
   mergeE: (...args) => callOnEmptyTraversal('mergeE', args),
   mergeV: (...args) => callOnEmptyTraversal('mergeV', args),
   min: (...args) => callOnEmptyTraversal('min', args),
@@ -1832,6 +1838,7 @@ const statics = {
   outE: (...args) => callOnEmptyTraversal('outE', args),
   outV: (...args) => callOnEmptyTraversal('outV', args),
   path: (...args) => callOnEmptyTraversal('path', args),
+  product: (...args) => callOnEmptyTraversal('product', args),
   project: (...args) => callOnEmptyTraversal('project', args),
   properties: (...args) => callOnEmptyTraversal('properties', args),
   property: (...args) => callOnEmptyTraversal('property', args),

gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py

@@ -1875,10 +1875,18 @@ def aggregate(*args):
     return __.aggregate(*args)
 
 
+def all_(*args):
+    return __.all_(*args)
+
+
 def and_(*args):
     return __.and_(*args)
 
 
+def any_(*args):
+    return __.any_(*args)
+
+
 def as_(*args):
     return __.as_(*args)
 
@@ -1947,10 +1955,18 @@ def coin(*args):
     return __.coin(*args)
 
 
+def combine(*args):
+    return __.combine(*args)
+
+
 def concat(*args):
     return __.concat(*args)
 
 
+def conjoin(*args):
+    return __.conjoin(*args)
+
+
 def constant(*args):
     return __.constant(*args)
 
@@ -1979,6 +1995,10 @@ def dedup(*args):
     return __.dedup(*args)
 
 
+def difference(*args):
+    return __.difference(*args)
+
+
 def discard(*args):
     return __.discard(*args)
 
@@ -2125,6 +2145,10 @@ def inject(*args):
     return __.inject(*args)
 
 
+def intersect(*args):
+    return __.intersect(*args)
+
+
 def is_(*args):
     return __.is_(*args)
 
@@ -2181,6 +2205,10 @@ def mean(*args):
     return __.mean(*args)
 
 
+def merge(*args):
+    return __.merge(*args)
+
+
 def merge_e(*args):
     return __.merge_e(*args)
 
@@ -2245,6 +2273,10 @@ def path(*args):
     return __.path(*args)
 
 
+def product(*args):
+    return __.product(*args)
+
+
 def project(*args):
     return __.project(*args)
 
@@ -2420,6 +2452,7 @@ def values(*args):
 def where(*args):
     return __.where(*args)
 
+statics.add_static('E', E)
 
 statics.add_static('V', V)
 
@@ -2433,8 +2466,12 @@ def where(*args):
 
 statics.add_static('aggregate', aggregate)
 
+statics.add_static('all_', all_)
+
 statics.add_static('and_', and_)
 
+statics.add_static('any_', any_)
+
 statics.add_static('as_', as_)
 
 statics.add_static('as_bool', as_bool)
@@ -2469,8 +2506,12 @@ def where(*args):
 
 statics.add_static('coin', coin)
 
+statics.add_static('combine', combine)
+
 statics.add_static('concat', concat)
 
+statics.add_static('conjoin', conjoin)
+
 statics.add_static('constant', constant)
 
 statics.add_static('count', count)
@@ -2485,6 +2526,8 @@ def where(*args):
 
 statics.add_static('dedup', dedup)
 
+statics.add_static('difference', difference)
+
 statics.add_static('discard', discard)
 
 statics.add_static('disjunct', disjunct)
@@ -2555,6 +2598,8 @@ def where(*args):
 
 statics.add_static('inject', inject)
 
+statics.add_static('intersect', intersect)
+
 statics.add_static('is_', is_)
 
 statics.add_static('key', key)
@@ -2583,6 +2628,8 @@ def where(*args):
 
 statics.add_static('mean', mean)
 
+statics.add_static('merge', merge)
+
 statics.add_static('merge_e', merge_e)
 
 statics.add_static('merge_v', merge_v)
@@ -2615,6 +2662,8 @@ def where(*args):
 
 statics.add_static('path', path)
 
+statics.add_static('product', product)
+
 statics.add_static('project', project)
 
 statics.add_static('properties', properties)