Export isValidLocation and locationToFeature

Author: bhousel

index.mjs

@@ -1,5 +1,12 @@
+/* DATA */
 import { features } from './dist/features.json';
-export { features };
-
 import { resources } from './dist/resources.json';
-export { resources };
+
+/* CODE */
+import locationToFeature from './lib/locationToFeature.js';
+import isValidLocation from './lib/isValidLocation.js';
+
+export {
+  features, resources,
+  locationToFeature, isValidLocation
+};

lib/isValidLocation.js

@@ -1,6 +1,7 @@
 const CountryCoder = require('country-coder');
 
-module.exports = (location, features) => {
+
+function isValidLocation(location, features) {
   features = features || {};
 
   if (Array.isArray(location)) {   // a [lon,lat] coordinate pair?
@@ -17,5 +18,6 @@ module.exports = (location, features) => {
     let ccmatch = CountryCoder.feature(location);
     return !!ccmatch;
   }
+}
 
-};
+module.exports = isValidLocation;

lib/locationToFeature.js

@@ -2,7 +2,7 @@ const CountryCoder = require('country-coder');
 const circleToPolygon = require('circle-to-polygon');
 
 
-module.exports = (location, features) => {
+function locationToFeature(location, features) {
   features = features || {};
 
   if (Array.isArray(location)) {   // a [lon,lat] coordinate pair?
@@ -54,5 +54,6 @@ module.exports = (location, features) => {
       return null;
     }
   }
+}
 
-};
+module.exports = locationToFeature;

package.json

@@ -41,7 +41,9 @@
     "json-stringify-pretty-compact": "^1.1.0",
     "jsonschema": "^1.1.0",
     "rollup": "^1.25.1",
+    "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-node-resolve": "^5.0.4",
     "shelljs": "^0.8.0",
     "tap": "^14.8.2"
   },

rollup.config.js

@@ -1,13 +1,17 @@
+import commonjs from 'rollup-plugin-commonjs';
 import json from 'rollup-plugin-json';
+import nodeResolve from 'rollup-plugin-node-resolve';
 
 export default {
-    input: 'index.mjs',
-    output: {
-        name: 'oci',
-        file: 'dist/index.js',
-        format: 'umd'
-    },
-    plugins: [
-        json({ indent: '' })
-    ]
+  input: 'index.mjs',
+  output: {
+    name: 'oci',
+    file: 'dist/index.js',
+    format: 'umd'
+  },
+  plugins: [
+    nodeResolve(),
+    commonjs(),
+    json({ indent: '' })
+  ]
 };