Merge pull request neo4j#708 from oskarhane/fix-false-positive-rel

Add transport types to use when transferring results ww -> main thread

Author: pe4cey

__mocks__/neo4j.js

@@ -27,9 +27,8 @@ integerFn.prototype.toString = function () {
 
 var out = {
   v1: {
-    Int: integerFn,
     isInt: function (val) {
-      return val instanceof integerFn
+      return val instanceof out.v1.Integer
     },
     types: {
       Node: function Node (id, labels, properties) {
@@ -56,7 +55,7 @@ var out = {
         this.end = end
       }
     },
-    Integer: function Integer ({ low, high }) {
+    Integer: function Integer (low, high) {
       this.low = low
       this.high = high
     }
@@ -78,6 +77,16 @@ out.v1.types.PathSegment.prototype.toString = function () {
 out.v1.Integer.prototype.toInt = function () {
   return this.low
 }
-out.v1.int = val => new out.v1.Integer(val)
+out.v1.Integer.prototype.toString = function () {
+  return this.low
+}
+out.v1.Int = out.v1.Integer
+out.v1.int = val => {
+  if (val /* is compatible */ instanceof out.v1.Integer) return val
+  if (typeof val === 'number') return new out.v1.Integer(val)
+  if (typeof val === 'string') return new out.v1.Integer(val)
+  // Throws for non-objects, converts non-instanceof Integer:
+  return new out.v1.Integer(val.low, val.high)
+}
 
 module.exports = out

package.json

@@ -15,8 +15,10 @@
     "apiVersion": "^1.2.0"
   },
   "scripts": {
-    "start": "webpack-dashboard -t 'Neo4j Browser' -- webpack-dev-server --colors --no-info",
-    "starts": "webpack-dashboard -t 'Neo4j Browser' -- webpack-dev-server --https --colors --no-info",
+    "start":
+      "webpack-dashboard -t 'Neo4j Browser' -- webpack-dev-server --colors --no-info",
+    "starts":
+      "webpack-dashboard -t 'Neo4j Browser' -- webpack-dev-server --https --colors --no-info",
     "startnodash": "webpack-dev-server --colors --no-info",
     "precommit": "lint-staged",
     "format": "prettier-eslint 'src/**/!(*.min).js' 'src/**/*.jsx' --write",
@@ -27,24 +29,20 @@
     "build": "rm -rf ./dist && NODE_ENV=\"production\" webpack",
     "prepare-jar": "node ./scripts/prepare-mvn-package.js",
     "jar": "yarn build && mvn package",
-    "version-pom": "node ./scripts/set-pom-version.js -f ./pom.xml -v $npm_package_version",
+    "version-pom":
+      "node ./scripts/set-pom-version.js -f ./pom.xml -v $npm_package_version",
     "version": "npm run version-pom && git add ./pom.xml"
   },
   "lint-staged": {
     "linters": {
-      "*.{js,jsx}": [
-        "prettier-eslint --write",
-        "git add"
-      ]
+      "*.{js,jsx}": ["prettier-eslint --write", "git add"]
     }
   },
   "jest": {
-    "testPathIgnorePatterns": [
-      ".jsx$",
-      "/e2e_tests/"
-    ],
+    "testPathIgnorePatterns": [".jsx$", "/e2e_tests/"],
     "moduleNameMapper": {
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|html)$": "<rootDir>/__mocks__/fileMock.js",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|html)$":
+        "<rootDir>/__mocks__/fileMock.js",
       "\\.(css|less)$": "<rootDir>/__mocks__/styleMock.js",
       "neo4j": "<rootDir>/__mocks__/neo4j.js",
       "^react-dom/server$": "preact-render-to-string",
@@ -56,10 +54,7 @@
       "^browser-components(.*)$": "<rootDir>/src/browser/components$1",
       "worker-loader": "<rootDir>/__mocks__/workerLoaderMock.js"
     },
-    "modulePaths": [
-      "<rootDir>/src",
-      "<rootDir>/src/shared"
-    ]
+    "modulePaths": ["<rootDir>/src", "<rootDir>/src/shared"]
   },
   "devDependencies": {
     "autoprefixer": "^7.1.4",
@@ -118,7 +113,7 @@
     "redux-mock-store": "^1.2.3",
     "style-loader": "^0.18.1",
     "url-loader": "^0.5.8",
-    "webpack": "^3.5.6",
+    "webpack": "^3.11.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dashboard": "^0.4.0",
     "webpack-dev-server": "^2.7.1",