gremlin 3.7.4 → 3.7.6

package/eslint.config.mjs

@@ -0,0 +1,143 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+import js from "@eslint/js";
+import prettier from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier";
+import globals from "globals";
+
+export default [
+  js.configs.recommended,
+  prettier,
+  {
+    plugins: {
+      prettier: prettierPlugin,
+    },
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: "commonjs",
+      globals: {
+        ...globals.node,
+        ...globals.commonjs,
+        ...globals.mocha,
+        BigInt: "readonly",
+      },
+    },
+    rules: {
+      "prettier/prettier": ["error", { endOfLine: "auto" }],
+      "linebreak-style": 0,
+      quotes: ["error", "single"],
+      semi: ["error", "always"],
+      "no-constant-condition": ["error", { checkLoops: false }],
+      strict: ["error", "global"],
+      "array-callback-return": "error",
+      curly: "error",
+      "no-unused-vars": ["error", { args: "none" }],
+      "global-require": "error",
+      eqeqeq: ["error", "allow-null"],
+      "guard-for-in": "error",
+      "no-alert": "error",
+      "no-caller": "error",
+      "no-case-declarations": "error",
+      "no-else-return": "error",
+      "no-empty-pattern": "error",
+      "no-eval": "error",
+      "no-extend-native": "error",
+      "no-extra-bind": "error",
+      "no-extra-label": "error",
+      "no-floating-decimal": "error",
+      "no-global-assign": ["error", { exceptions: [] }],
+      "no-implicit-coercion": [
+        "off",
+        {
+          boolean: false,
+          number: true,
+          string: true,
+          allow: [],
+        },
+      ],
+      "no-implied-eval": "error",
+      "no-labels": ["error", { allowLoop: false, allowSwitch: false }],
+      "no-lone-blocks": "error",
+      "no-loop-func": "error",
+      "no-multi-spaces": "error",
+      "no-new": "error",
+      "no-new-func": "error",
+      "no-new-wrappers": "error",
+      "no-octal-escape": "error",
+      "no-proto": "error",
+      "no-prototype-builtins": 0,
+      "no-redeclare": "error",
+      "no-restricted-properties": [
+        "error",
+        {
+          object: "arguments",
+          property: "callee",
+          message: "arguments.callee is deprecated",
+        },
+        {
+          property: "__defineGetter__",
+          message: "Please use Object.defineProperty instead.",
+        },
+        {
+          property: "__defineSetter__",
+          message: "Please use Object.defineProperty instead.",
+        },
+      ],
+      "no-self-assign": "error",
+      "no-self-compare": "error",
+      "no-sequences": "error",
+      "no-throw-literal": "error",
+      "no-unmodified-loop-condition": "off",
+      "no-unused-expressions": [
+        "error",
+        {
+          allowShortCircuit: false,
+          allowTernary: false,
+        },
+      ],
+      "no-useless-call": "off",
+      "no-useless-concat": "error",
+      "no-useless-escape": "error",
+      "no-useless-return": "error",
+      "no-void": "error",
+      "no-with": "error",
+      "no-buffer-constructor": "error",
+      radix: "error",
+      "no-var": "error",
+      "prefer-const": "error",
+      "arrow-body-style": ["error", "as-needed"],
+      "arrow-spacing": "error",
+      "no-confusing-arrow": ["error", { allowParens: true }],
+      yoda: "error",
+      "constructor-super": "error",
+      "require-await": "error",
+      "require-atomic-updates": "off",
+    },
+  },
+  {
+    ignores: ["test/**/*.js", "doc/**/*.js", "node_modules/**/*", ".prettierrc.js", "eslint.config.mjs"],
+  },
+  {
+    files: ["eslint.config.mjs"],
+    languageOptions: {
+      sourceType: "module",
+    },
+  },
+];

package/index.js

@@ -7,7 +7,7 @@
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an

package/lib/driver/connection.js

@@ -135,9 +135,12 @@ class Connection extends EventEmitter {
       'perMessageDeflate',
     ]);
     // Check if any `ws` specific options are provided and are non-null / non-undefined
-    const hasWsSpecificOptions = Object.entries(this.options).some(
-      ([key, value]) => wsSpecificOptions.has(key) && ![null, undefined].includes(value),
-    );
+    const hasWsSpecificOptions =
+      Object.entries(this.options).some(
+        ([key, value]) => wsSpecificOptions.has(key) && ![null, undefined].includes(value),
+      ) ||
+      this._enableCompression || // we need to check the presence of this variable and pass this into ws
+      this._enableUserAgentOnConnect; // global websocket will send "node" as user agent by default which doesn't comply with Gremlin
     // Only use the global websocket if we don't have any unsupported options
     const useGlobalWebSocket = !hasWsSpecificOptions && globalThis.WebSocket;
     const WebSocket = useGlobalWebSocket || (await import('ws')).default;
@@ -163,10 +166,15 @@ class Connection extends EventEmitter {
 
     this._ws.addEventListener('open', this.#handleOpen);
     this._ws.addEventListener('error', this.#handleError);
-    this._ws.on('unexpected-response', this.#handleUnexpectedResponse);
+    // Only attach unexpected-response listener if WebSocket supports .on() method
+    // Browser WebSocket does not have this event and .on() method
+    if (this._ws && 'on' in this._ws) {
+      // The following listener needs to use `.on` and `.off` because the `ws` package's addEventListener only accepts certain event types
+      // Ref: https://github.com/websockets/ws/blob/8.16.0/lib/event-target.js#L202-L241
+      this._ws.on('unexpected-response', this.#handleUnexpectedResponse);
+    }
     this._ws.addEventListener('message', this.#handleMessage);
     this._ws.addEventListener('close', this.#handleClose);
-
     return await this._openPromise;
   }
 
@@ -415,7 +423,13 @@ class Connection extends EventEmitter {
     });
     this._ws.removeEventListener('open', this.#handleOpen);
     this._ws.removeEventListener('error', this.#handleError);
-    this._ws.off('unexpected-response', this.#handleUnexpectedResponse);
+    // Only remove unexpected-response listener for Node.js WebSocket (ws package)
+    // Browser WebSocket does not have this event and .off() method
+    if (this._ws && 'off' in this._ws) {
+      // The following listener needs to use `.on` and `.off` because the `ws` package's addEventListener only accepts certain event types
+      // Ref: https://github.com/websockets/ws/blob/8.16.0/lib/event-target.js#L202-L241
+      this._ws.off('unexpected-response', this.#handleUnexpectedResponse);
+    }
     this._ws.removeEventListener('message', this.#handleMessage);
     this._ws.removeEventListener('close', this.#handleClose);
     this._openPromise = null;

package/lib/process/graph-traversal.js

@@ -1773,13 +1773,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),
   disjunct: (...args) => callOnEmptyTraversal('disjunct', args),
   drop: (...args) => callOnEmptyTraversal('drop', args),
   element: (...args) => callOnEmptyTraversal('element', args),
@@ -1805,6 +1808,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),
@@ -1818,6 +1822,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),
@@ -1831,6 +1836,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),

package/lib/structure/graph.js

@@ -79,10 +79,12 @@ class Edge extends Element {
     this.inV = inV;
     this.properties = {};
     if (properties) {
-      const keys = Object.keys(properties);
-      for (let i = 0; i < keys.length; i++) {
-        const k = keys[i];
-        this.properties[k] = properties[k].value;
+      if (Array.isArray(properties)) {
+        // Handle array of Property objects
+        properties.forEach((prop) => (this.properties[prop.key] = prop.value));
+      } else {
+        // Handle object format as before
+        Object.keys(properties).forEach((k) => (this.properties[k] = properties[k].value));
       }
     }
   }

package/lib/utils.js

@@ -25,7 +25,7 @@
 
 const uuid = require('uuid');
 
-const gremlinVersion = '3.7.4'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const gremlinVersion = '3.7.6'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 exports.toLong = function toLong(value) {
   return new Long(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gremlin",
-  "version": "3.7.4",
+  "version": "3.7.6",
   "description": "JavaScript Gremlin Language Variant",
   "author": "Apache TinkerPop team",
   "keywords": [
@@ -24,15 +24,16 @@
     "chai": "~4.5.0",
     "chai-string": "~1.5.0",
     "colors": "1.4.0",
-    "cross-env": "^7.0.3",
-    "cucumber": "~6.0.7",
-    "eslint": "^8.42.0",
+    "cross-env": "^10.1.0",
+    "@cucumber/cucumber": "~12.7.0",
+    "@eslint/js": "^9.16.0",
+    "eslint": "^9.36.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.0.0",
-    "grunt": "^1.5.3",
-    "grunt-cli": "~1.5.0",
-    "grunt-jsdoc": "~2.4.1",
-    "mocha": "^10.2.0",
+    "globals": "^15.14.0",
+    "jsdoc": "^4.0.5",
+    "js-yaml": "^3.14.2",
+    "mocha": "^11.7.5",
     "prettier": "^3.0.0"
   },
   "repository": {
@@ -56,7 +57,8 @@
     "features-docker": "npm run features-graphson30-docker && npm run features-graphbinary-docker",
     "features-graphson30-docker": "cross-env CLIENT_MIMETYPE='application/vnd.gremlin-v3.0+json' cucumber-js --require test/cucumber ../gremlin-test/",
     "features-graphbinary-docker": "cross-env CLIENT_MIMETYPE='application/vnd.graphbinary-v1.0' cucumber-js --require test/cucumber ../gremlin-test/",
-    "lint": "eslint --ext .js ."
+    "lint": "eslint .",
+    "doc": "jsdoc -r -d doc -R README.md lib/"
   },
   "engines": {
     "node": ">=20"

package/.eslintrc.js

@@ -1,154 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-'use strict';
-
-module.exports = {
-  env: {
-    commonjs: true,
-    es2022: true,
-    node: true,
-  },
-  parserOptions: {
-    ecmaVersion: 2022,
-  },
-  ignorePatterns: ['test/**/*.js', 'doc/**/*.js'],
-  extends: ['eslint:recommended', 'prettier'],
-  plugins: ['prettier'],
-  rules: {
-    'prettier/prettier': ['error', { endOfLine: 'auto' }],
-    'linebreak-style': 0,
-    quotes: ['error', 'single'],
-    semi: ['error', 'always'],
-    'no-constant-condition': ['error', { checkLoops: false }],
-    strict: ['error', 'global'],
-    'array-callback-return': 'error',
-    curly: 'error',
-    'no-unused-vars': ['error', { args: 'none' }],
-    'global-require': 'error',
-    eqeqeq: ['error', 'allow-null'],
-
-    // make sure for-in loops have an if statement
-    'guard-for-in': 'error',
-    'no-alert': 'error',
-    'no-caller': 'error',
-    'no-case-declarations': 'error',
-    'no-else-return': 'error',
-    'no-empty-pattern': 'error',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'error',
-    'no-extra-label': 'error',
-    'no-floating-decimal': 'error',
-    'no-global-assign': ['error', { exceptions: [] }],
-    'no-implicit-coercion': [
-      'off',
-      {
-        boolean: false,
-        number: true,
-        string: true,
-        allow: [],
-      },
-    ],
-    'no-implied-eval': 'error',
-    'no-labels': ['error', { allowLoop: false, allowSwitch: false }],
-    'no-lone-blocks': 'error',
-    'no-loop-func': 'error',
-    //
-    // disallow use of multiple spaces
-    'no-multi-spaces': 'error',
-    'no-new': 'error',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal-escape': 'error',
-    'no-proto': 'error',
-    'no-prototype-builtins': 0,
-    'no-redeclare': 'error',
-    'no-restricted-properties': [
-      'error',
-      {
-        object: 'arguments',
-        property: 'callee',
-        message: 'arguments.callee is deprecated',
-      },
-      {
-        property: '__defineGetter__',
-        message: 'Please use Object.defineProperty instead.',
-      },
-      {
-        property: '__defineSetter__',
-        message: 'Please use Object.defineProperty instead.',
-      },
-    ],
-    'no-self-assign': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'error',
-    'no-throw-literal': 'error',
-    'no-unmodified-loop-condition': 'off',
-    'no-unused-expressions': [
-      'error',
-      {
-        allowShortCircuit: false,
-        allowTernary: false,
-      },
-    ],
-    'no-useless-call': 'off',
-    'no-useless-concat': 'error',
-    'no-useless-escape': 'error',
-    'no-useless-return': 'error',
-    'no-void': 'error',
-    'no-with': 'error',
-    'no-buffer-constructor': 'error',
-    radix: 'error',
-    'no-var': 'error',
-    'prefer-const': 'error',
-    'arrow-body-style': ['error', 'as-needed'],
-    'arrow-spacing': 'error',
-    'no-confusing-arrow': ['error', { allowParens: true }],
-    yoda: 'error',
-    'constructor-super': 'error',
-    'require-await': 'error',
-    'require-atomic-updates': 'off',
-  },
-  globals: {
-    Buffer: 'off',
-    Promise: true,
-    Symbol: false,
-    Uint16Array: false,
-    Int32Array: false,
-    Int8Array: false,
-    BigInt: false,
-    process: false,
-    setInterval: false,
-    setTimeout: false,
-    setImmediate: false,
-    clearInterval: false,
-    clearTimeout: false,
-    describe: false,
-    xdescribe: false,
-    it: false,
-    xit: false,
-    context: false,
-    after: false,
-    afterEach: false,
-    before: false,
-    beforeEach: false,
-    __filename: false,
-  },
-};

package/Gruntfile.js

@@ -1,35 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-'use strict';
-
-module.exports = function (grunt) {
-  grunt.loadNpmTasks('grunt-jsdoc');
-  grunt.initConfig({
-    jsdoc: {
-      dist: {
-        src: ['lib'],
-        options: {
-          destination: 'doc',
-          recurse: true,
-          readme: 'README.md',
-        },
-      },
-    },
-  });
-};

package/licenses/chai

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Chai.js Assertion Library
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.