Prototype-extension approach.

lib/client.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var invariant = require('invariant');
+var xtend = require('xtend/mutable');
 
 var MapboxGeocoder = require('./services/geocoder');
 var MapboxSurface = require('./services/surface');
@@ -19,14 +20,13 @@ var MapboxMatching = require('./services/matching');
 function MapboxClient(accessToken) {
   invariant(typeof accessToken === 'string',
     'accessToken required to instantiate MapboxClient');
-
   this.accessToken = accessToken;
-
-  this.geocoder = new MapboxGeocoder(accessToken);
-  this.surface = new MapboxSurface(accessToken);
-  this.matching = new MapboxMatching(accessToken);
-  this.directions = new MapboxDirections(accessToken);
-
 }
 
+xtend(MapboxClient.prototype,
+  MapboxGeocoder.prototype,
+  MapboxSurface.prototype,
+  MapboxDirections.prototype,
+  MapboxMatching.prototype);
+
 module.exports = MapboxClient;

lib/services/directions.js

@@ -123,3 +123,5 @@ MapboxDirections.prototype.getDirections = function(waypoints, options, callback
     callback(err, res.body);
   });
 };
+
+module.exports = MapboxDirections;

lib/services/geocoder.js

@@ -17,7 +17,8 @@ var invariant = require('invariant'),
  */
 function MapboxGeocoder(accessToken) {
   invariant(typeof accessToken === 'string',
-    'accessToken required to instantiate MapboxClient');
+    'accessToken required to instantiate MapboxGeocoder');
+    console.log('geocoder constructed');
   this.accessToken = accessToken;
 }
 

lib/services/matching.js

@@ -125,3 +125,5 @@ MapboxMatching.prototype.matching = function(trace, options, callback) {
       callback(err, res.body);
     });
 };
+
+module.exports = MapboxMatching;

lib/services/surface.js

@@ -108,3 +108,5 @@ MapboxSurface.prototype.surface = function(mapid, layer, fields, path, options,
     callback(err, res.body);
   });
 };
+
+module.exports = MapboxSurface;

package.json

@@ -37,6 +37,7 @@
     "es6-template-strings": "^1.0.0",
     "geojsonhint": "^1.0.1",
     "invariant": "^2.1.0",
-    "superagent": "^1.2.0"
+    "superagent": "^1.2.0",
+    "xtend": "^4.0.0"
   }
 }