Fix export json to turn bolt ints into js integers

Author: eve-bright

app/scripts/directives/exportable.coffee

@@ -68,7 +68,8 @@ angular.module('neo.exportable', ['neo.csv'])
       '$scope',
       'CSV',
       'exportService'
-      ($scope, CSV, exportService) ->
+      'BoltIntHelpers'
+      ($scope, CSV, exportService, BoltIntHelpers) ->
 
         $scope.exportGraphSVG = ->
           $scope.$emit('frame.export.graph.svg')
@@ -88,6 +89,7 @@ angular.module('neo.exportable', ['neo.csv'])
 
         $scope.exportJSON = (data) ->
           return unless data
+          data = BoltIntHelpers.mapBoltIntsToInts data
           exportService.download('result.json', 'application/json', JSON.stringify(data))
 
         $scope.exportCSV = (data) ->

lib/boltIntHelpers.coffee

@@ -37,16 +37,22 @@ class neo.boltIntHelpers
 
 
   mapBoltIntsToStrings = (val) ->
-    return val.toString() if bolt.isInt val
-    return val.map(mapBoltIntsToStrings) if Array.isArray(val)
-    return val if val is null
-    if typeof val == 'object'
+    return mapBoltInts(val, (boltInt) -> boltInt.toString())
+
+  mapBoltIntsToInts = (val) ->
+    return mapBoltInts(val, (boltInt) -> parseInt(boltInt.toString()))
+
+  mapBoltInts = (val, mappingFunc) ->
+    return mappingFunc val if bolt.isInt val
+    return val.map((item) -> mapBoltInts(item, mappingFunc)) if Array.isArray(val)
+    if typeof val == 'object' && val != null
       out = {}
       Object.keys(val).forEach((key) ->
-        out[key] = mapBoltIntsToStrings(val[key]))
+        out[key] = mapBoltInts(val[key], mappingFunc))
       return out
     return val
 
   constructor: ->
     @stringify = stringify
     @mapBoltIntsToStrings = mapBoltIntsToStrings
+    @mapBoltIntsToInts = mapBoltIntsToInts

test/spec/services/boltIntHelpers.coffee

@@ -56,12 +56,12 @@ describe 'BoltIntHelpers', () ->
       obj = {a:bolt.int("1"), arrayKey: arr, anotherKey: null}
       expect(BoltIntHelpers.stringify(obj)).toBe '{"a":1,"arrayKey":[9999,{"b":43243242423434324}],"anotherKey":null}'
 
-  describe 'mapBigIntegersToStrings', ->
+  describe 'mapBoltIntegersToStrings', ->
 
-    it 'should map big integers to strings', ->
+    it 'should map bolt integers to strings', ->
       expect(BoltIntHelpers.mapBoltIntsToStrings(bolt.int("922337203685477580"))).toBe '922337203685477580'
 
-    it 'should map all big integers to strings in nested obejcts', ->
+    it 'should map all bolt integers to strings in nested obejcts', ->
       arr = [bolt.int("9999"), {b: bolt.int("43243242423434324")}]
       obj = {a:bolt.int("1"), arrayKey: arr}
 
@@ -73,6 +73,24 @@ describe 'BoltIntHelpers', () ->
     it 'should return null if obejct is null', ->
       expect(BoltIntHelpers.mapBoltIntsToStrings(null)).toBe null
 
+  describe 'mapBoltIntegersToInts', ->
+
+    it 'should map bolt integers to plain integers', ->
+      expect(BoltIntHelpers.mapBoltIntsToInts(bolt.int("922337203685477580"))).toBe 922337203685477600
+
+    it 'should map all bolt integers to integers in nested obejcts', ->
+      arr = [bolt.int("9999"), {b: bolt.int("43243242423434324")}]
+      obj = {a:bolt.int("1"), arrayKey: arr}
+
+      mappedObj = BoltIntHelpers.mapBoltIntsToInts(obj)
+      expect(mappedObj.a).toBe(1)
+      expect(mappedObj.arrayKey[0]).toBe(9999)
+      expect(mappedObj.arrayKey[1].b).toBe(43243242423434324)
+
+    it 'should return null if obejct is null', ->
+      expect(BoltIntHelpers.mapBoltIntsToInts(null)).toBe null
+
+