Fix crash on NaN

neo4j-contrib · May 23, 2023 · 5b175cb · 5b175cb
1 parent 134f8d6
commit 5b175cb
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/__tests__/neovis.tests.ts b/__tests__/neovis.tests.ts
@@ -568,7 +568,8 @@ describe('Neovis', () => {
 				test6: new Neo4j.types.LocalTime(1, 2, 3, 4),
 				test7: new Neo4j.types.Point(1, 2, 3, 4),
 				test8: new Neo4j.types.Point(1, 2, 3),
-				test9: new Neo4j.types.Time(1, 2, 3, 4, 5)
+				test9: new Neo4j.types.Time(1, 2, 3, 4, 5),
+				test10: NaN
 			}),
 			new Neo4j.types.Relationship(new Neo4j.types.Integer(0, 0), new Neo4j.types.Integer(0, 0), new Neo4j.types.Integer(1, 0), 'TEST', {}),
 			new Neo4j.types.Path(
@@ -647,6 +648,7 @@ describe('Neovis', () => {
 			expect(neovis.nodes.get(1)?.raw.properties.test7).toBeInstanceOf(Neo4j.types.Point);
 			expect(neovis.nodes.get(1)?.raw.properties.test8).toBeInstanceOf(Neo4j.types.Point);
 			expect(neovis.nodes.get(1)?.raw.properties.test9).toBeInstanceOf(Neo4j.types.Time);
+			expect(neovis.nodes.get(1)?.raw.properties.test10).toBeNaN();
 		});
 	});
 });
diff --git a/dist/main.map60ef0e3e7494c6dd3a6d b/dist/main.map60ef0e3e7494c6dd3a6d
diff --git a/dist/main.map877f9266ed26e5e4321b b/dist/main.map877f9266ed26e5e4321b
diff --git a/dist/main.map591dd2c8384464a705c7 → dist/main.map9e0555983e992e5d5f0d b/dist/main.map591dd2c8384464a705c7 → dist/main.map9e0555983e992e5d5f0d
diff --git a/dist/neovis-without-dependencies.js b/dist/neovis-without-dependencies.js
diff --git a/dist/neovis.js b/dist/neovis.js
diff --git a/examples/simple-dataFunction-example.html b/examples/simple-dataFunction-example.html
@@ -92,6 +92,7 @@
 			viz = new NeoVis.default(config);
 			viz.render();
 			console.log(viz);
+			viz.registerOnEvent('error', ({error}) => console.error(error))
 
 		}
     </script>

diff --git a/src/neovis.ts b/src/neovis.ts
@@ -116,9 +116,11 @@ function isFakeInteger(property: FakeIdentity | unknown): property is FakeIdenti
 }
 
 function propertyToNormal(value: unknown): unknown {
-	if (Array.isArray(value)) {
+	if (value === null) {
+		return NaN;
+	} else if (Array.isArray(value)) {
 		return value.map(propertyToNormal);
-	} else if(typeof value === 'object' && Object.keys(value).length in FakeTypeToType) {
+	} else if(typeof value === 'object' && value !== null && Object.keys(value).length in FakeTypeToType) {
 		for(const fakeType of FakeTypeToType[Object.keys(value).length]) {
 			let isCorrectType = true;
 			const rets: unknown[] = [];