Add support for old identifiers absence in 5.x protocol

Author: bigmontz

packages/bolt-connection/src/packstream/packstream-v5.js

@@ -37,7 +37,7 @@ export class Unpacker extends v2.Unpacker {
     this._verifyStructSize('Node', NODE_STRUCT_SIZE, structSize)
 
     return new Node(
-      this.unpack(buffer), // Identity
+      _valueOrDefault(this.unpack(buffer), -1), // Identity
       this.unpack(buffer), // Labels
       this.unpack(buffer), // Properties,
       this.unpack(buffer) // ElementId
@@ -48,9 +48,9 @@ export class Unpacker extends v2.Unpacker {
     this._verifyStructSize('Relationship', RELATIONSHIP_STRUCT_SIZE, structSize)
 
     return new Relationship(
-      this.unpack(buffer), // Identity
-      this.unpack(buffer), // Start Node Identity
-      this.unpack(buffer), // End Node Identity
+      _valueOrDefault(this.unpack(buffer), -1), // Identity
+      _valueOrDefault(this.unpack(buffer), -1), // Start Node Identity
+      _valueOrDefault(this.unpack(buffer), -1), // End Node Identity
       this.unpack(buffer), // Type
       this.unpack(buffer), // Properties,
       this.unpack(buffer), // ElementId
@@ -67,10 +67,14 @@ export class Unpacker extends v2.Unpacker {
     )
 
     return new UnboundRelationship(
-      this.unpack(buffer), // Identity
+      _valueOrDefault(this.unpack(buffer), -1), // Identity
       this.unpack(buffer), // Type
       this.unpack(buffer), // Properties
       this.unpack(buffer) // ElementId
     )
   }
 }
+
+function _valueOrDefault(value, defaultValue) {
+  return value === null ? defaultValue : value
+}

packages/bolt-connection/test/packstream/packstream-v5.test.js

@@ -239,6 +239,18 @@ describe('#unit PackStreamV5', () => {
       return [nodeStruct, expectedNode, { disableLosslessIntegers: true, useBigInt: false }]
     }
 
+    function validWithoutOldIdentifiers() {
+      const identity = null
+      const labels = ['a', 'b']
+      const properties = { 'a': 1, 'b': 2 }
+      const elementId = 'element_id_1'
+      const expectedNode = new Node(-1, labels, properties, elementId)
+      const nodeStruct = new Structure(0x4e, [
+        identity, labels, properties, elementId
+      ])
+      return [nodeStruct, expectedNode, { disableLosslessIntegers: true, useBigInt: false }]
+    }
+
     function validWithInt() {
       const identity = int(1)
       const labels = ['a', 'b']
@@ -266,7 +278,8 @@ describe('#unit PackStreamV5', () => {
     return [
       validWithNumber(),
       validWithInt(),
-      validWithBigInt()
+      validWithBigInt(),
+      validWithoutOldIdentifiers()
     ]
   }
 
@@ -297,6 +310,25 @@ describe('#unit PackStreamV5', () => {
       return [relStruct, expectedRel, { disableLosslessIntegers: true, useBigInt: false }]
     }
 
+    function validWithoutOldIdentifiers() {
+      const identity = null
+      const start = null
+      const end = null
+      const type = 'KNOWS'
+      const properties = { 'a': 1, 'b': 2 }
+      const elementId = 'element_id_1'
+      const startNodeElementId = 'element_id_2'
+      const endNodeElementId = 'element_id_3'
+      const expectedRel = new Relationship(
+        -1, -1, -1, type, properties,
+        elementId, startNodeElementId, endNodeElementId)
+      const relStruct = new Structure(0x52, [
+        identity, start, end, type, properties, elementId,
+        startNodeElementId, endNodeElementId
+      ])
+      return [relStruct, expectedRel, { disableLosslessIntegers: true, useBigInt: false }]
+    }
+
     function validWithInt() {
       const identity = int(1)
       const start = int(2)
@@ -338,7 +370,8 @@ describe('#unit PackStreamV5', () => {
     return [
       validWithNumber(),
       validWithInt(),
-      validWithBigInt()
+      validWithBigInt(),
+      validWithoutOldIdentifiers()
     ]
   }
 
@@ -362,6 +395,18 @@ describe('#unit PackStreamV5', () => {
       return [struct, expectedUnboundRel, { disableLosslessIntegers: true, useBigInt: false }]
     }
 
+    function validWithoutOldIdentifiers() {
+      const identity = null
+      const type = 'DOESNT_KNOW'
+      const properties = { 'a': 1, 'b': 2 }
+      const elementId = 'element_id_1'
+      const expectedUnboundRel = new UnboundRelationship(-1, type, properties, elementId)
+      const struct = new Structure(0x72, [
+        identity, type, properties, elementId
+      ])
+      return [struct, expectedUnboundRel, { disableLosslessIntegers: true, useBigInt: false }]
+    }
+
     function validWithInt() {
       const identity = int(1)
       const type = 'DOESNT_KNOW'
@@ -389,7 +434,8 @@ describe('#unit PackStreamV5', () => {
     return [
       validWithNumber(),
       validWithInt(),
-      validWithBigInt()
+      validWithBigInt(),
+      validWithoutOldIdentifiers()
     ]
   }