From 494d5d58552e00078781ef6096c6a14ecdab74e5 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Tue, 19 Apr 2016 18:15:57 +0200
Subject: [PATCH] Foxx.getExports -> legacy

---
 js/server/modules/@arangodb/foxx/index.js        | 12 ++++++++----
 js/server/modules/@arangodb/foxx/legacy/index.js |  7 ++++++-
 js/server/modules/@arangodb/foxx/service.js      |  6 +++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/js/server/modules/@arangodb/foxx/index.js b/js/server/modules/@arangodb/foxx/index.js
index 3a25f05a01..df282291b5 100644
--- a/js/server/modules/@arangodb/foxx/index.js
+++ b/js/server/modules/@arangodb/foxx/index.js
@@ -21,8 +21,12 @@
 /// @author Alan Plum
 ////////////////////////////////////////////////////////////////////////////////
 
-const manager = require('@arangodb/foxx/manager');
-
-exports.getExports = function (path) {
-  return manager.requireApp('/' + path.replace(/(^\/+|\/+$)/, ''));
+module.exports = {
+  get createRouter() {
+    return require('@arangodb/foxx/router');
+  },
+  get queue() {
+    const queues = require('@arangodb/foxx/queues');
+    return queues.get('default');
+  }
 };
diff --git a/js/server/modules/@arangodb/foxx/legacy/index.js b/js/server/modules/@arangodb/foxx/legacy/index.js
index 2216b9dab0..275629fdb2 100644
--- a/js/server/modules/@arangodb/foxx/legacy/index.js
+++ b/js/server/modules/@arangodb/foxx/legacy/index.js
@@ -30,7 +30,12 @@ exports.createQuery = require('@arangodb/foxx/legacy/query').createQuery;
 exports.toJSONSchema = require('@arangodb/foxx/legacy/schema').toJSONSchema;
 exports.queues = require('@arangodb/foxx/queues');
 
-exports.getExports = require('../').getExports;
+const manager = require('@arangodb/foxx/manager');
+
+exports.getExports = function (path) {
+  return manager.requireApp('/' + path.replace(/(^\/+|\/+$)/, ''));
+};
+
 exports.requireApp = function (path) {
   return exports.getExports(path);
 };
diff --git a/js/server/modules/@arangodb/foxx/service.js b/js/server/modules/@arangodb/foxx/service.js
index 8acf75f91b..99325c16c8 100644
--- a/js/server/modules/@arangodb/foxx/service.js
+++ b/js/server/modules/@arangodb/foxx/service.js
@@ -481,7 +481,11 @@ function createDependencies(definitions, options) {
       enumerable: true,
       get() {
         const mount = options[name];
-        return mount ? require('@arangodb/foxx').getExports(mount) : null;
+        if (!mount) {
+          return null;
+        }
+        const FoxxManager = require('@arangodb/foxx/manager');
+        return FoxxManager.requireApp('/' + mount.replace(/(^\/+|\/+$)/, ''));
       }
     });
   });