fix: migrate to wkt-io-ts which will validate the geojson and WKT

Author: holvonixAdvay

package.json

@@ -111,7 +111,7 @@
     "io-ts": "^2.0.1",
     "io-ts-types": "^0.5.0",
     "monocle-ts": "^2.0.0",
-    "wkx": "^0.4.8"
+    "wkt-io-ts": "^1.0.0"
   },
   "devDependencies": {
     "@holvonix-open/release-config-js": "^1.0.4",

src/Q.ts

@@ -34,7 +34,10 @@ import {
 import * as util from 'util';
 
 import * as spatial from './spatial';
-import * as wkx from 'wkx';
+import * as wktio from 'wkt-io-ts';
+import { WKT } from 'wkt-io-ts';
+import { isRight } from 'fp-ts/lib/Either';
+import { PathReporter } from 'io-ts/lib/PathReporter';
 
 export { spatial };
 
@@ -254,8 +257,12 @@ function nope(): never {
   throw new Error('unsupported');
 }
 
-function wkt(g: Spatial['value']['geom']): string {
-  return wkx.Geometry.parseGeoJSON(g).toWkt();
+function wkt(g: Spatial['value']['geom']): WKT {
+  const d = wktio.WKTStringFromGeometry.decode(g);
+  if (!isRight(d)) {
+    throw new Error('Cannot parse: ' + PathReporter.report(d).join('; '));
+  }
+  return d.right;
 }
 
 function toLiteralString<T extends Primitive>(

test/test-Q.ts

@@ -663,6 +663,19 @@ describe('Q', () => {
         ],
       };
       const obj = d(PolygonIO.decode(p));
+      it('throws on bad geojson', () => {
+        const bad: Polygon = {
+          type: 'PolygonZ' as 'Polygon',
+          coordinates: [
+            [[10.0, 0.0], [101.0, 21.0], [60.0, 1.024], [10.0, 0.0]],
+            [[0, 0], [-10, -10], [20, 30], [0, 0]],
+          ],
+        };
+        assert.throws(
+          () => Q.toString(Q.term('geo', Q.spatial.intersects(bad))),
+          /Invalid value/
+        );
+      });
       it('intersects', () => {
         assert.deepStrictEqual(
           Q.toString(Q.term('geo', Q.spatial.intersects(obj))),

yarn.lock

@@ -5612,6 +5612,18 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
+wkt-io-ts@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wkt-io-ts/-/wkt-io-ts-1.0.0.tgz#a68d0a3c534a66377ae851617cdd41f643e15ae5"
+  integrity sha512-DhFv1zt6lwojE3ZSdxP7KOt4HXVmLplsLbyiw48ldFsaYQjzU2vzPyeDQSBn3YJYS82EqZYlLknKXjHYcetzHg==
+  dependencies:
+    "@holvonix-open/geojson-io-ts" "^5.0.0"
+    fp-ts "^2.0.5"
+    io-ts "^2.0.1"
+    io-ts-types "^0.5.0"
+    monocle-ts "^2.0.0"
+    wkx "^0.4.8"
+
 wkx@^0.4.8:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"