From 1651ad2a8d22800ea3c34f48543c50d1bc015ef8 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Mon, 5 Nov 2018 11:19:52 +0000
Subject: [PATCH] Expose currentFacet directly

---
 packages/core/src/index.js             | 1 +
 packages/driver-http-node/src/index.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/index.js b/packages/core/src/index.js
index 5fe027d..f7c8073 100644
--- a/packages/core/src/index.js
+++ b/packages/core/src/index.js
@@ -36,6 +36,7 @@ module.exports._$ = Skeleton._$;
 
 module.exports._Dataspace = Dataspace;
 module.exports.Dataspace = Dataspace.Dataspace;
+module.exports.currentFacet = Dataspace.Dataspace.currentFacet;
 module.exports.Ground = Ground;
 
 module.exports._Assertions = Assertions;
diff --git a/packages/driver-http-node/src/index.js b/packages/driver-http-node/src/index.js
index 6ee7d19..b474d37 100644
--- a/packages/driver-http-node/src/index.js
+++ b/packages/driver-http-node/src/index.js
@@ -16,7 +16,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //---------------------------------------------------------------------------
 
-import { Seal, Observe, Dataspace, Skeleton } from "@syndicate-lang/core";
+import { Seal, Observe, Dataspace, Skeleton, currentFacet } from "@syndicate-lang/core";
 const { isCapture, captureName } = Skeleton;
 import { parse as parseUrl } from "url";
 
@@ -141,7 +141,7 @@ function _server(host, port, httpsOptions) {
       return;
     }
     react {
-      const facet = Dataspace.currentFacet();
+      const facet = currentFacet();
       let id = nextId++;
       assert Request(id, server, method, pieces, url.query, Seal(req));
       stop on retracted Observe(Request(_, server, method, pathPattern, _, _)) {
@@ -191,7 +191,7 @@ function _server(host, port, httpsOptions) {
     let { _path: pathPattern } = mapLookup(wsHandlerMap, pieces);
 
     react {
-      const facet = Dataspace.currentFacet();
+      const facet = currentFacet();
       let id = nextId++;
       assert WebSocket(id, server, pieces, url.query);