Merge branch 'meniRoy-master'

enniel · Jul 26, 2022 · 629f287 · 629f287
2 parents a1b24be + 95cd700
commit 629f287
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 84 deletions.
diff --git a/src/Bbox.js b/src/Bbox.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isBbox(value)) {
-    throw new GraphQLError(`Expected GeoJSON Bbox but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isBbox,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONBboxScalar',

diff --git a/src/Feature.js b/src/Feature.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isFeature(value)) {
-    throw new GraphQLError(`Expected GeoJSON Feature but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isFeature,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONFeatureScalar',

diff --git a/src/FeatureCollection.js b/src/FeatureCollection.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isFeatureCollection(value)) {
-    throw new GraphQLError(`Expected GeoJSON FeatureCollection but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isFeatureCollection,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONFeatureCollectionScalar',

diff --git a/src/Geometry.js b/src/Geometry.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isGeometryObject(value)) {
-    throw new GraphQLError(`Expected GeoJSON Geometry but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isGeometryObject,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONGeometryScalar',

diff --git a/src/GeometryCollection.js b/src/GeometryCollection.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isGeometryCollection(value)) {
-    throw new GraphQLError(`Expected GeoJSON GeometryCollection but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isGeometryCollection,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONGeometryCollectionScalar',

diff --git a/src/LineString.js b/src/LineString.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isLineString(value)) {
-    throw new GraphQLError(`Expected GeoJSON LineString but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isLineString,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONLineStringScalar',

diff --git a/src/MultiLineString.js b/src/MultiLineString.js
@@ -1,14 +1,11 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
+
+const validate = value => validator(GJV.isMultiLineString,value);
 
-const validate = value => {
-  if (!GJV.isMultiLineString(value)) {
-    throw new GraphQLError(`Expected GeoJSON MultiLineString but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
 
 export default new GraphQLScalarType({
   name: 'GeoJSONMultiLineStringScalar',

diff --git a/src/MultiPoint.js b/src/MultiPoint.js
@@ -1,14 +1,11 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
+
+const validate = value => validator(GJV.isMultiPoint,value);
 
-const validate = value => {
-  if (!GJV.isMultiPoint(value)) {
-    throw new GraphQLError(`Expected GeoJSON MultiPoint but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
 
 export default new GraphQLScalarType({
   name: 'GeoJSONMultiPointScalar',

diff --git a/src/MultiPolygon.js b/src/MultiPolygon.js
@@ -1,14 +1,11 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
+
+const validate = value => validator(GJV.isMultiPolygon,value);
 
-const validate = value => {
-  if (!GJV.isMultiPolygon(value)) {
-    throw new GraphQLError(`Expected GeoJSON MultiPolygon but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
 
 export default new GraphQLScalarType({
   name: 'GeoJSONMultiPolygonScalar',

diff --git a/src/Point.js b/src/Point.js
@@ -1,14 +1,10 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
 
-const validate = value => {
-  if (!GJV.isPoint(value)) {
-    throw new GraphQLError(`Expected GeoJSON Point but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
+const validate = value => validator(GJV.isPoint,value);
 
 export default new GraphQLScalarType({
   name: 'GeoJSONPointScalar',

diff --git a/src/Polygon.js b/src/Polygon.js
@@ -1,14 +1,11 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
+
+const validate = value => validator(GJV.isPolygon,value);
 
-const validate = value => {
-  if (!GJV.isPolygon(value)) {
-    throw new GraphQLError(`Expected GeoJSON Polygon but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
 
 export default new GraphQLScalarType({
   name: 'GeoJSONPolygonScalar',

diff --git a/src/Position.js b/src/Position.js
@@ -1,14 +1,11 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 const GJV = require('geojson-validation');
 
 import parseLiteral from './parseLiteral';
+import validator from './validator';
+
+const validate = value => validator(GJV.isPosition,value);
 
-const validate = value => {
-  if (!GJV.isPosition(value)) {
-    throw new GraphQLError(`Expected GeoJSON Position but got: ${JSON.stringify(value)}`);
-  }
-  return value;
-};
 
 export default new GraphQLScalarType({
   name: 'GeoJSONPositionScalar',

diff --git a/src/validator.js b/src/validator.js
@@ -0,0 +1,10 @@
+import {GraphQLError} from 'graphql';
+
+export default (validator, data) => {
+    validator(data, (isValid, errors) => {
+        if (!isValid) {
+            throw new GraphQLError(JSON.stringify(errors));
+        }
+    });
+    return data;
+};