refactor: improve import & exports

lykmapipo · Dec 16, 2019 · 7479de3 · 7479de3
1 parent a856635
commit 7479de3
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 56 deletions.
diff --git a/index.js b/index.js
@@ -19,9 +19,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const _ = require('lodash');
-const geojson = require(path.join(__dirname, 'lib', 'geojson'));
+const geojson = require('./lib/geojson');
 const {
   isGeometry,
   isPoint,
@@ -49,18 +48,14 @@ _.forEach(geojson, function (value, key) {
 
 
 /* import geometries */
-const { Geometry } = require(path.join(__dirname, 'lib', 'geometry'));
-const { Point } = require(path.join(__dirname, 'lib', 'point'));
-const { LineString } = require(path.join(__dirname, 'lib', 'linestring'));
-const { Polygon } = require(path.join(__dirname, 'lib', 'polygon'));
-const { MultiPoint } = require(path.join(__dirname, 'lib', 'multipoint'));
-const { MultiPolygon } = require(path.join(__dirname, 'lib', 'multipolygon'));
-const {
-  MultiLineString
-} = require(path.join(__dirname, 'lib', 'multilinestring'));
-const {
-  GeometryCollection
-} = require(path.join(__dirname, 'lib', 'geometrycollection'));
+const { Geometry } = require('./lib/geometry');
+const { Point } = require('./lib/point');
+const { LineString } = require('./lib/linestring');
+const { Polygon } = require('./lib/polygon');
+const { MultiPoint } = require('./lib/multipoint');
+const { MultiPolygon } = require('./lib/multipolygon');
+const { MultiLineString } = require('./lib/multilinestring');
+const { GeometryCollection } = require('./lib/geometrycollection');
 
 
 /* constants */

diff --git a/lib/geojson.js b/lib/geojson.js
@@ -30,10 +30,7 @@ const {
   randomGeometry,
   randomGeometryCollection,
 } = require('@lykmapipo/geo-tools');
-const {
-  isPosition,
-  isPolygonCoor
-} = require('geojson-validation');
+const { isPosition, isPolygonCoor } = require('geojson-validation');
 
 
 /* geojson geometry types */

diff --git a/lib/geometry.js b/lib/geometry.js
@@ -2,11 +2,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const {
-  GEOMETRIES
-} = require(path.join(__dirname, 'geojson'));
+const { GEOMETRIES } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/geometrycollection.js b/lib/geometrycollection.js
@@ -2,10 +2,9 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_GEOMETRYCOLLECTION } = require(path.join(__dirname, 'geojson'));
-const { Geometry } = require(path.join(__dirname, 'geometry'));
+const { TYPE_GEOMETRYCOLLECTION } = require('./geojson');
+const { Geometry } = require('./geometry');
 
 
 /* constants */

diff --git a/lib/linestring.js b/lib/linestring.js
@@ -7,9 +7,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_LINESTRING } = require(path.join(__dirname, 'geojson'));
+const { TYPE_LINESTRING } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/multilinestring.js b/lib/multilinestring.js
@@ -5,9 +5,8 @@
 /* @todo refactor types to utilities */
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_MULTILINESTRING } = require(path.join(__dirname, 'geojson'));
+const { TYPE_MULTILINESTRING } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/multipoint.js b/lib/multipoint.js
@@ -7,9 +7,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_MULTIPOINT } = require(path.join(__dirname, 'geojson'));
+const { TYPE_MULTIPOINT } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/multipolygon.js b/lib/multipolygon.js
@@ -7,9 +7,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_MULTIPOLYGON } = require(path.join(__dirname, 'geojson'));
+const { TYPE_MULTIPOLYGON } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/point.js b/lib/point.js
@@ -7,9 +7,8 @@
 
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_POINT } = require(path.join(__dirname, 'geojson'));
+const { TYPE_POINT } = require('./geojson');
 
 
 /* constants */

diff --git a/lib/polygon.js b/lib/polygon.js
@@ -5,9 +5,8 @@
 /* @todo refactor types to utilities */
 
 /* dependencies */
-const path = require('path');
 const { Schema } = require('mongoose');
-const { TYPE_POLYGON } = require(path.join(__dirname, 'geojson'));
+const { TYPE_POLYGON } = require('./geojson');
 
 
 /* constants */

diff --git a/test/geometry.spec.js b/test/geometry.spec.js
@@ -2,7 +2,6 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
 const {
@@ -11,7 +10,7 @@ const {
   randomPoint,
   randomLineString,
   randomPolygon
-} = require(path.join(__dirname, '..'));
+} = require('..');
 
 
 describe('Geometry', () => {

diff --git a/test/geometrycollection.spec.js b/test/geometrycollection.spec.js
@@ -2,14 +2,13 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
 const {
   GeometryCollection,
   GEO_2DSPHERE,
   randomGeometryCollection
-} = require(path.join(__dirname, '..'));
+} = require('..');
 
 
 describe('GeometryCollection', () => {

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -2,8 +2,7 @@
 
 
 /* dependencies */
-const path = require('path');
-const { expect } = require('chai');
+const { expect } = require('@lykmapipo/mongoose-test-helpers');
 const {
   randomPoint,
   randomMultiPoint,
@@ -14,7 +13,7 @@ const {
   centroidOf,
   parseCoordinateString,
   toCoordinateString
-} = require(path.join(__dirname, '..'));
+} = require('..');
 
 describe('GeoJSON', () => {
 

diff --git a/test/linestring.spec.js b/test/linestring.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { LineString, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { LineString, GEO_2DSPHERE } = require('..');
 
 
 describe('LineString', () => {

diff --git a/test/multilinestring.spec.js b/test/multilinestring.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { MultiLineString, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { MultiLineString, GEO_2DSPHERE } = require('..');
 
 
 describe('MultiLineString', () => {

diff --git a/test/multipoint.spec.js b/test/multipoint.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { MultiPoint, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { MultiPoint, GEO_2DSPHERE } = require('..');
 
 
 describe('MultiPoint', () => {

diff --git a/test/multipolygon.spec.js b/test/multipolygon.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { MultiPolygon, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { MultiPolygon, GEO_2DSPHERE } = require('..');
 
 
 describe('MultiPolygon', () => {

diff --git a/test/point.spec.js b/test/point.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { Point, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { Point, GEO_2DSPHERE } = require('..');
 
 
 describe('Point', () => {

diff --git a/test/polygon.spec.js b/test/polygon.spec.js
@@ -2,10 +2,9 @@
 
 
 /*** dependencies */
-const path = require('path');
 const _ = require('lodash');
 const { createTestModel, expect } = require('@lykmapipo/mongoose-test-helpers');
-const { Polygon, GEO_2DSPHERE } = require(path.join(__dirname, '..'));
+const { Polygon, GEO_2DSPHERE } = require('..');
 
 
 describe('Polygon', () => {