Start moving towards esm

Author: davenquinn

v2/columns.ts

@@ -1,3 +1,5 @@
+import { handleUnitsRoute } from "./units";
+
 var api = require("./api"),
   async = require("async"),
   dbgeo = require("dbgeo"),
@@ -14,7 +16,7 @@ module.exports = function (req, res, next, callback) {
     [
       function (callback) {
         //call units to group units by col_id
-        require("./units")(req, null, null, function (error, result) {
+        handleUnitsRoute(req, null, null, function (error, result) {
           if (error) {
             callback(error);
           }

v2/fossils.ts

@@ -1,3 +1,5 @@
+import { handleUnitsRoute } from "./units";
+
 var api = require("./api"),
   dbgeo = require("dbgeo"),
   async = require("async"),
@@ -59,7 +61,7 @@ module.exports = function (req, res, next) {
             req.query.econ_type ||
             req.query.econ_class
           ) {
-            require("./units")(req, null, null, function (error, result) {
+            handleUnitsRoute(req, null, null, function (error, result) {
               if (error) {
                 callback(error);
               }

v2/index.ts

@@ -1,6 +1,8 @@
 const api = require("./api");
 const larkin = require("./larkin");
 
+import { handleUnitsRoute } from "./units";
+
 export async function buildAPI() {
   await larkin.checkCapabilities(api);
 
@@ -27,7 +29,7 @@ export async function buildAPI() {
   api.route("/sections").get(require("./sections"));
 
   api.route("/units").get(function (req, res, next) {
-    require("./units")(req, res, next);
+    handleUnitsRoute(req, res, next);
   });
 
   api.route("/fossils").get(require("./fossils"));

v2/mobile/macro_summary.ts

@@ -1,3 +1,5 @@
+import { handleUnitsRoute } from "../units";
+
 var api = require("../api"),
   async = require("async"),
   larkin = require("../larkin"),
@@ -222,7 +224,7 @@ module.exports = function (req, res, next) {
               },
             );
           } else {
-            require("../units")(
+            handleUnitsRoute(
               { query: { unit_id: units[0].units } },
               null,
               null,

v2/mobile/map_query.ts

@@ -1,3 +1,5 @@
+import { handleUnitsRoute } from "../units";
+
 var api = require("../api");
 var async = require("async");
 var larkin = require("../larkin");
@@ -386,7 +388,7 @@ module.exports = function (req, res, next) {
               bestFit && bestFit.strat_names ? bestFit.strat_names : [];
 
             if (macroUnits.length) {
-              require("../units")(
+              handleUnitsRoute(
                 { query: { unit_id: macroUnits.join(",") } },
                 null,
                 null,

v2/sections.ts

@@ -1,3 +1,5 @@
+import { handleUnitsRoute } from "./units";
+
 var api = require("./api"),
   async = require("async"),
   _ = require("underscore"),
@@ -20,7 +22,7 @@ module.exports = function (req, res, next) {
     [
       // First pass the request to units and get the units back
       function (callback) {
-        require("./units")(req, null, null, function (error, result) {
+        handleUnitsRoute(req, null, null, function (error, result) {
           if (error) {
             return callback(error);
           }

v2/units.ts

@@ -6,7 +6,7 @@ var api = require("./api"),
 
 import { buildProjectsFilter } from "./utils";
 
-module.exports = function (req, res, next, cb) {
+export function handleUnitsRoute(req, res, next, cb) {
   // If no parameters, send the route definition
   if (Object.keys(req.query).length < 1) {
     return larkin.info(req, res, next);
@@ -702,4 +702,4 @@ module.exports = function (req, res, next, cb) {
       }
     },
   );
-};
+}