gremlin 4.0.0-beta.2 → 4.0.0-beta.3

package/build/cjs/structure/io/binary/internals/VertexPropertySerializer.cjs

@@ -61,103 +61,45 @@ class VertexPropertySerializer {
         bufs.push(this.ioc.listSerializer.serialize([], true));
         return buffer_1.Buffer.concat(bufs);
     }
-    deserialize(buffer, fullyQualifiedFormat = true) {
-        let len = 0;
-        let cursor = buffer;
-        try {
-            if (buffer === undefined || buffer === null || !(buffer instanceof buffer_1.Buffer)) {
-                throw new Error('buffer is missing');
-            }
-            if (buffer.length < 1) {
-                throw new Error('buffer is empty');
-            }
-            if (fullyQualifiedFormat) {
-                const type_code = cursor.readUInt8();
-                len++;
-                if (type_code !== this.ioc.DataType.VERTEXPROPERTY) {
-                    throw new Error('unexpected {type_code}');
-                }
-                cursor = cursor.slice(1);
-                if (cursor.length < 1) {
-                    throw new Error('{value_flag} is missing');
-                }
-                const value_flag = cursor.readUInt8();
-                len++;
-                if (value_flag === 1) {
-                    return { v: null, len };
-                }
-                if (value_flag !== 0) {
-                    throw new Error('unexpected {value_flag}');
-                }
-                cursor = cursor.slice(1);
-            }
-            // {id} is a fully qualified typed value composed of {type_code}{type_info}{value_flag}{value}
-            let id, id_len;
-            try {
-                ({ v: id, len: id_len } = this.ioc.anySerializer.deserialize(cursor));
-                len += id_len;
-            }
-            catch (err) {
-                err.message = '{id}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(id_len);
-            // {label} is a List value
-            let label, label_len;
-            try {
-                ({ v: label, len: label_len } = this.ioc.listSerializer.deserialize(cursor, false));
-                label = Array.isArray(label) && label.length > 0 ? label[0] : label;
-                len += label_len;
-            }
-            catch (err) {
-                err.message = '{label}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(label_len);
-            // {value} is a fully qualified typed value composed of {type_code}{type_info}{value_flag}{value}
-            let value, value_len;
-            try {
-                ({ v: value, len: value_len } = this.ioc.anySerializer.deserialize(cursor));
-                len += value_len;
-            }
-            catch (err) {
-                err.message = '{value}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(value_len);
-            // {parent} is a fully qualified typed value composed of {type_code}{type_info}{value_flag}{value} which contains the parent Vertex.
-            // Note that as TinkerPop currently send "references" only, this value will always be null.
-            let parent_len;
-            try {
-                ({ len: parent_len } = this.ioc.unspecifiedNullSerializer.deserialize(cursor));
-                len += parent_len;
-            }
-            catch (err) {
-                err.message = '{parent}: ' + err.message;
-                throw err;
-            }
-            // TODO: should we verify that parent is null?
-            cursor = cursor.slice(parent_len);
-            // {properties} is a fully qualified typed value composed of {type_code}{type_info}{value_flag}{value} which contains properties. Note that as TinkerPop currently send "references" only, this value will always be null.
-            let properties, properties_len;
-            try {
-                ({ v: properties, len: properties_len } = this.ioc.anySerializer.deserialize(cursor));
-                len += properties_len;
-            }
-            catch (err) {
-                err.message = '{properties}: ' + err.message;
-                throw err;
-            }
-            // TODO: should we verify that properties is null?
-            cursor = cursor.slice(properties_len);
-            // null properties are deserialized into empty lists
-            const vp_props = properties ? properties : [];
-            const v = new graph_js_1.VertexProperty(id, label, value, vp_props);
-            return { v, len };
+    /**
+     * Async deserialization of vertex property value bytes from a StreamReader.
+     * @param {StreamReader} reader
+     * @param {number} valueFlag
+     * @param {number} typeCode
+     * @returns {Promise<VertexProperty>}
+     */
+    async deserializeValue(reader, valueFlag, typeCode) {
+        // {id} fully qualified
+        const id = await this.ioc.anySerializer.deserialize(reader);
+        // {label} bare list, extract first element
+        const labelList = await this.ioc.listSerializer.deserializeValue(reader, 0x00, this.ioc.DataType.LIST);
+        const label = Array.isArray(labelList) && labelList.length > 0 ? labelList[0] : labelList;
+        // {value} fully qualified
+        const value = await this.ioc.anySerializer.deserialize(reader);
+        // {parent} fully qualified (always null in current TinkerPop)
+        await this.ioc.anySerializer.deserialize(reader);
+        // {properties} fully qualified
+        const properties = await this.ioc.anySerializer.deserialize(reader);
+        return new graph_js_1.VertexProperty(id, label, value, properties || []);
+    }
+    /**
+     * Async fully-qualified deserialization from a StreamReader.
+     * @param {StreamReader} reader
+     * @returns {Promise<VertexProperty|null>}
+     */
+    async deserialize(reader) {
+        const type_code = await reader.readUInt8();
+        if (type_code !== this.ioc.DataType.VERTEXPROPERTY) {
+            throw new Error(`VertexPropertySerializer: unexpected {type_code}=0x${type_code.toString(16)}`);
+        }
+        const value_flag = await reader.readUInt8();
+        if (value_flag === 0x01) {
+            return null;
         }
-        catch (err) {
-            throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
+        if (value_flag !== 0x00) {
+            throw new Error(`VertexPropertySerializer: unexpected {value_flag}=0x${value_flag.toString(16)}`);
         }
+        return this.deserializeValue(reader, value_flag, type_code);
     }
 }
 exports.default = VertexPropertySerializer;

package/build/cjs/structure/io/binary/internals/VertexPropertySerializer.d.cts

@@ -3,13 +3,20 @@ export default class VertexPropertySerializer {
     ioc: any;
     canBeUsedFor(value: any): value is VertexProperty<any, any, any, any>;
     serialize(item: any, fullyQualifiedFormat?: boolean): Buffer<ArrayBuffer>;
-    deserialize(buffer: any, fullyQualifiedFormat?: boolean, ...args: any[]): {
-        v: null;
-        len: number;
-    } | {
-        v: VertexProperty<any, any, Record<string, any>, any>;
-        len: number;
-    };
+    /**
+     * Async deserialization of vertex property value bytes from a StreamReader.
+     * @param {StreamReader} reader
+     * @param {number} valueFlag
+     * @param {number} typeCode
+     * @returns {Promise<VertexProperty>}
+     */
+    deserializeValue(reader: StreamReader, valueFlag: number, typeCode: number): Promise<VertexProperty>;
+    /**
+     * Async fully-qualified deserialization from a StreamReader.
+     * @param {StreamReader} reader
+     * @returns {Promise<VertexProperty|null>}
+     */
+    deserialize(reader: StreamReader): Promise<VertexProperty | null>;
 }
 import { VertexProperty } from '../../../graph.cjs';
 import { Buffer } from 'buffer';

package/build/cjs/structure/io/binary/internals/VertexSerializer.cjs

@@ -48,81 +48,54 @@ class VertexSerializer {
         // {id}
         bufs.push(this.ioc.anySerializer.serialize(item.id));
         // {label}
-        const labels = Array.isArray(item.label) ? item.label : item.label ? [item.label] : [];
+        const labels = item.labels instanceof Set
+            ? Array.from(item.labels)
+            : Array.isArray(item.label)
+                ? item.label
+                : item.label
+                    ? [item.label]
+                    : [];
         bufs.push(this.ioc.listSerializer.serialize(labels, false));
         // {properties}
         bufs.push(this.ioc.listSerializer.serialize([], true));
         return buffer_1.Buffer.concat(bufs);
     }
-    deserialize(buffer, fullyQualifiedFormat = true) {
-        let len = 0;
-        let cursor = buffer;
-        try {
-            if (buffer === undefined || buffer === null || !(buffer instanceof buffer_1.Buffer)) {
-                throw new Error('buffer is missing');
-            }
-            if (buffer.length < 1) {
-                throw new Error('buffer is empty');
-            }
-            if (fullyQualifiedFormat) {
-                const type_code = cursor.readUInt8();
-                len++;
-                if (type_code !== this.ioc.DataType.VERTEX) {
-                    throw new Error('unexpected {type_code}');
-                }
-                cursor = cursor.slice(1);
-                if (cursor.length < 1) {
-                    throw new Error('{value_flag} is missing');
-                }
-                const value_flag = cursor.readUInt8();
-                len++;
-                if (value_flag === 1) {
-                    return { v: null, len };
-                }
-                if (value_flag !== 0) {
-                    throw new Error('unexpected {value_flag}');
-                }
-                cursor = cursor.slice(1);
-            }
-            let id, id_len;
-            try {
-                ({ v: id, len: id_len } = this.ioc.anySerializer.deserialize(cursor));
-                len += id_len;
-            }
-            catch (err) {
-                err.message = '{id}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(id_len);
-            let label, label_len;
-            try {
-                ({ v: label, len: label_len } = this.ioc.listSerializer.deserialize(cursor, false));
-                label = Array.isArray(label) && label.length > 0 ? label[0] : label;
-                len += label_len;
-            }
-            catch (err) {
-                err.message = '{label}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(label_len);
-            let properties, properties_len;
-            try {
-                ({ v: properties, len: properties_len } = this.ioc.anySerializer.deserialize(cursor));
-                len += properties_len;
-            }
-            catch (err) {
-                err.message = '{properties}: ' + err.message;
-                throw err;
-            }
-            cursor = cursor.slice(properties_len);
-            // null properties are deserialized into empty lists
-            const vertex_props = properties ? properties : [];
-            const v = new graph_js_1.Vertex(id, label, vertex_props);
-            return { v, len };
+    /**
+     * Async deserialization of vertex value bytes from a StreamReader.
+     * @param {StreamReader} reader
+     * @param {number} valueFlag
+     * @param {number} typeCode
+     * @returns {Promise<Vertex>}
+     */
+    async deserializeValue(reader, valueFlag, typeCode) {
+        // {id} fully qualified
+        const id = await this.ioc.anySerializer.deserialize(reader);
+        // {label} bare list - full multi-label list
+        const labelList = await this.ioc.listSerializer.deserializeValue(reader, 0x00, this.ioc.DataType.LIST);
+        const labels = Array.isArray(labelList) ? labelList : labelList ? [labelList] : [];
+        const label = labels.length > 0 ? labels[0] : 'vertex';
+        // {properties} fully qualified
+        const properties = await this.ioc.anySerializer.deserialize(reader);
+        return new graph_js_1.Vertex(id, label, properties || [], labels);
+    }
+    /**
+     * Async fully-qualified deserialization from a StreamReader.
+     * @param {StreamReader} reader
+     * @returns {Promise<Vertex|null>}
+     */
+    async deserialize(reader) {
+        const type_code = await reader.readUInt8();
+        if (type_code !== this.ioc.DataType.VERTEX) {
+            throw new Error(`VertexSerializer: unexpected {type_code}=0x${type_code.toString(16)}`);
+        }
+        const value_flag = await reader.readUInt8();
+        if (value_flag === 0x01) {
+            return null;
         }
-        catch (err) {
-            throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
+        if (value_flag !== 0x00) {
+            throw new Error(`VertexSerializer: unexpected {value_flag}=0x${value_flag.toString(16)}`);
         }
+        return this.deserializeValue(reader, value_flag, type_code);
     }
 }
 exports.default = VertexSerializer;

package/build/cjs/structure/io/binary/internals/VertexSerializer.d.cts

@@ -3,15 +3,20 @@ export default class VertexSerializer {
     ioc: any;
     canBeUsedFor(value: any): value is Vertex<any, any, any, any>;
     serialize(item: any, fullyQualifiedFormat?: boolean): Buffer<ArrayBuffer>;
-    deserialize(buffer: any, fullyQualifiedFormat?: boolean, ...args: any[]): {
-        v: null;
-        len: number;
-    } | {
-        v: Vertex<any, Record<string, any>, any, {
-            [x: string]: [import("../../../graph.cjs").VertexProperty<string, any, Record<string, any>, any>, ...import("../../../graph.cjs").VertexProperty<string, any, Record<string, any>, any>[]];
-        }>;
-        len: number;
-    };
+    /**
+     * Async deserialization of vertex value bytes from a StreamReader.
+     * @param {StreamReader} reader
+     * @param {number} valueFlag
+     * @param {number} typeCode
+     * @returns {Promise<Vertex>}
+     */
+    deserializeValue(reader: StreamReader, valueFlag: number, typeCode: number): Promise<Vertex>;
+    /**
+     * Async fully-qualified deserialization from a StreamReader.
+     * @param {StreamReader} reader
+     * @returns {Promise<Vertex|null>}
+     */
+    deserialize(reader: StreamReader): Promise<Vertex | null>;
 }
 import { Vertex } from '../../../graph.cjs';
 import { Buffer } from 'buffer';

package/build/cjs/utils.cjs

@@ -17,66 +17,183 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeferredPromise = exports.toArrayBuffer = exports.getUserAgent = exports.ImmutableMap = exports.emptyArray = exports.Long = void 0;
+exports.DeferredPromise = exports.toArrayBuffer = exports.getUserAgent = exports.ImmutableMap = exports.emptyArray = exports.Byte = exports.Short = exports.Double = exports.Float = exports.Int = exports.Long = exports.INT32_MAX = exports.INT32_MIN = void 0;
 exports.toLong = toLong;
+exports.toInt = toInt;
+exports.toFloat = toFloat;
+exports.toDouble = toDouble;
+exports.toShort = toShort;
+exports.toByte = toByte;
+exports.unwrap = unwrap;
 exports.getUuid = getUuid;
 exports.getUserAgentHeader = getUserAgentHeader;
 /**
  * A module containing any utility functions.
  * @author Jorge Bay Gondra
  */
-const uuid = __importStar(require("uuid"));
-const gremlinVersion = '4.0.0-beta.2'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const gremlinVersion = '4.0.0-beta.3'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const INT64_MIN = -9223372036854775808n;
+const INT64_MAX = 9223372036854775807n;
+exports.INT32_MIN = -2147483648;
+exports.INT32_MAX = 2147483647;
 function toLong(value) {
     return new Long(value);
 }
 class Long {
     value;
+    type = 'long';
     constructor(value) {
         this.value = value;
-        if (typeof value !== 'string' && typeof value !== 'number') {
-            throw new TypeError('The value must be a string or a number');
+        if (typeof value !== 'string' && typeof value !== 'number' && typeof value !== 'bigint') {
+            throw new TypeError('The value must be a string, a number, or a bigint');
         }
+        if (typeof value === 'string') {
+            if (!/^(?:0|-?[1-9]\d*)$/.test(value)) {
+                throw new TypeError('Long value must be a valid integer');
+            }
+            const n = BigInt(value);
+            if (n < INT64_MIN || n > INT64_MAX) {
+                throw new RangeError('Long value is outside int64 range');
+            }
+        }
+        if (typeof value === 'number') {
+            if (!Number.isInteger(value)) {
+                throw new TypeError('Long value must be an integer');
+            }
+            if (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER) {
+                throw new RangeError('Long number values outside safe integer range lose precision; use string or bigint');
+            }
+        }
+        if (typeof value === 'bigint') {
+            if (value < INT64_MIN || value > INT64_MAX) {
+                throw new RangeError('Long value is outside int64 range');
+            }
+        }
+    }
+    valueOf() {
+        if (typeof this.value === 'number')
+            return this.value;
+        const big = typeof this.value === 'bigint' ? this.value : BigInt(this.value);
+        if (big > BigInt(Number.MAX_SAFE_INTEGER) || big < BigInt(Number.MIN_SAFE_INTEGER)) {
+            throw new RangeError('Long value is outside safe integer range');
+        }
+        return Number(big);
+    }
+    [Symbol.toPrimitive](hint) {
+        if (hint === 'string')
+            return String(this.value);
+        return this.valueOf();
+    }
+    toJSON() {
+        if (typeof this.value === 'bigint')
+            return this.value.toString();
+        return this.value;
     }
 }
 exports.Long = Long;
+class Int {
+    value;
+    type = 'int';
+    constructor(value) {
+        this.value = value;
+        if (typeof value !== 'number') {
+            throw new TypeError('Int value must be a number');
+        }
+        if (!Number.isFinite(value) || !Number.isInteger(value)) {
+            throw new TypeError('Int value must be a finite integer');
+        }
+        if (value < exports.INT32_MIN || value > exports.INT32_MAX) {
+            throw new RangeError('Int value must be within int32 range');
+        }
+    }
+    valueOf() { return this.value; }
+    [Symbol.toPrimitive](hint) { return hint === 'string' ? String(this.value) : this.value; }
+    toJSON() { return this.value; }
+}
+exports.Int = Int;
+class Float {
+    value;
+    type = 'float';
+    constructor(value) {
+        this.value = value;
+        if (typeof value !== 'number') {
+            throw new TypeError('Float value must be a number');
+        }
+    }
+    valueOf() { return this.value; }
+    [Symbol.toPrimitive](hint) { return hint === 'string' ? String(this.value) : this.value; }
+    toJSON() { return this.value; }
+}
+exports.Float = Float;
+class Double {
+    value;
+    type = 'double';
+    constructor(value) {
+        this.value = value;
+        if (typeof value !== 'number') {
+            throw new TypeError('Double value must be a number');
+        }
+    }
+    valueOf() { return this.value; }
+    [Symbol.toPrimitive](hint) { return hint === 'string' ? String(this.value) : this.value; }
+    toJSON() { return this.value; }
+}
+exports.Double = Double;
+class Short {
+    value;
+    type = 'short';
+    constructor(value) {
+        this.value = value;
+        if (typeof value !== 'number') {
+            throw new TypeError('Short value must be a number');
+        }
+        if (!Number.isFinite(value) || !Number.isInteger(value)) {
+            throw new TypeError('Short value must be a finite integer');
+        }
+        if (value < -32768 || value > 32767) {
+            throw new RangeError('Short value must be within int16 range');
+        }
+    }
+    valueOf() { return this.value; }
+    [Symbol.toPrimitive](hint) { return hint === 'string' ? String(this.value) : this.value; }
+    toJSON() { return this.value; }
+}
+exports.Short = Short;
+class Byte {
+    value;
+    type = 'byte';
+    constructor(value) {
+        this.value = value;
+        if (typeof value !== 'number') {
+            throw new TypeError('Byte value must be a number');
+        }
+        if (!Number.isFinite(value) || !Number.isInteger(value)) {
+            throw new TypeError('Byte value must be a finite integer');
+        }
+        if (value < -128 || value > 127) {
+            throw new RangeError('Byte value must be within int8 range');
+        }
+    }
+    valueOf() { return this.value; }
+    [Symbol.toPrimitive](hint) { return hint === 'string' ? String(this.value) : this.value; }
+    toJSON() { return this.value; }
+}
+exports.Byte = Byte;
+function toInt(value) { return new Int(value); }
+function toFloat(value) { return new Float(value); }
+function toDouble(value) { return new Double(value); }
+function toShort(value) { return new Short(value); }
+function toByte(value) { return new Byte(value); }
+function unwrap(value) {
+    if (value instanceof Long || value instanceof Int || value instanceof Float ||
+        value instanceof Double || value instanceof Short || value instanceof Byte) {
+        return value.value;
+    }
+    return value;
+}
 function getUuid() {
-    // TODO: replace with `globalThis.crypto.randomUUID` once supported Node version is bump to >=19
-    return uuid.v4();
+    return globalThis.crypto.randomUUID();
 }
 exports.emptyArray = Object.freeze([]);
 class ImmutableMap extends Map {

package/build/cjs/utils.d.cts

@@ -1,9 +1,67 @@
-export declare function toLong(value: number | string): Long;
+export declare const INT32_MIN = -2147483648;
+export declare const INT32_MAX = 2147483647;
+export declare function toLong(value: number | string | bigint): Long;
 export declare class Long {
-    value: number | string;
-    constructor(value: number | string);
+    readonly value: number | string | bigint;
+    readonly type = "long";
+    constructor(value: number | string | bigint);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): string | number;
 }
-export declare function getUuid(): string;
+export declare class Int {
+    readonly value: number;
+    readonly type = "int";
+    constructor(value: number);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): number;
+}
+export declare class Float {
+    readonly value: number;
+    readonly type = "float";
+    constructor(value: number);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): number;
+}
+export declare class Double {
+    readonly value: number;
+    readonly type = "double";
+    constructor(value: number);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): number;
+}
+export declare class Short {
+    readonly value: number;
+    readonly type = "short";
+    constructor(value: number);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): number;
+}
+export declare class Byte {
+    readonly value: number;
+    readonly type = "byte";
+    constructor(value: number);
+    valueOf(): number;
+    [Symbol.toPrimitive](hint: string): string | number;
+    toJSON(): number;
+}
+export declare function toInt(value: number): Int;
+export declare function toFloat(value: number): Float;
+export declare function toDouble(value: number): Double;
+export declare function toShort(value: number): Short;
+export declare function toByte(value: number): Byte;
+export declare function unwrap(value: Float): number;
+export declare function unwrap(value: Double): number;
+export declare function unwrap(value: Int): number;
+export declare function unwrap(value: Long): number | string | bigint;
+export declare function unwrap(value: Short): number;
+export declare function unwrap(value: Byte): number;
+export declare function unwrap<T>(value: T): T;
+export declare function getUuid(): `${string}-${string}-${string}-${string}-${string}`;
 export declare const emptyArray: any[];
 export declare class ImmutableMap<K, V> extends Map<K, V> implements ReadonlyMap<K, V> {
     constructor(iterable?: Iterable<[K, V]>);

package/build/esm/driver/auth.d.ts

@@ -1,4 +1,4 @@
-import type { RequestInterceptor } from './connection.js';
+import type { RequestInterceptor } from './http-request.js';
 export declare function basic(username: string, password: string): RequestInterceptor;
 export interface AwsCredentials {
     accessKeyId: string;