Refactor Context/Binding into @loopback/ioc (#175)

packages/ioc/index.ts

@@ -0,0 +1,7 @@
+// Copyright IBM Corp. 2013,2017. All Rights Reserved.
+// Node module: loopback
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+export {Binding} from './src/binding';
+export {Context} from './src/context';

packages/ioc/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@loopback/ioc",
+  "version": "4.0.0-alpha.1",
+  "description": "LoopBack's container for Inversion of Control",
+  "main": "index",
+  "scripts": {
+    "acceptance": "mocha --opts ../../test/mocha.opts 'test/acceptance/**/*.ts'",
+    "integration": "mocha --opts ../../test/mocha.opts 'test/integration/**/*.ts'",
+    "test": "mocha --opts ../../test/mocha.opts 'test/unit/**/*.ts' 'test/integration/**/*.ts' 'test/acceptance/**/*.ts'",
+    "unit": "mocha --opts ../../test/mocha.opts 'test/unit/**/*.ts'"
+  },
+  "author": "IBM",
+  "license": "MIT",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "@loopback/testlab": "^4.0.0-alpha.1",
+    "mocha": "^3.2.0"
+  },
+  "keywords": [
+    "LoopBack",
+    "IoC",
+    "Inversion",
+    "Control",
+    "Container",
+    "Decorators"
+  ]
+}

packages/loopback/test/acceptance/context-bindings/creating-and-resolving-bindings.ts → packages/ioc/test/acceptance/creating-and-resolving-bindings.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import * as util from 'loopback/test/support/util';
+import {Context} from '../..';
 
 describe('Context bindings - Creating and resolving bindings', () => {
   let ctx;
@@ -68,6 +68,6 @@ describe('Context bindings - Creating and resolving bindings', () => {
   });
 
   function createContext() {
-    ctx = util.getContext();
+    ctx = new Context();
   }
 });

packages/loopback/test/acceptance/context-bindings/finding-bindings.ts → packages/ioc/test/acceptance/finding-bindings.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import * as util from 'loopback/test/support/util';
+import {Context} from '../..';
 
 describe('Context bindings - Finding bindings', () => {
   let ctx;
@@ -66,7 +66,7 @@ describe('Context bindings - Finding bindings', () => {
   });
 
   function createContext() {
-    ctx = util.getContext();
+    ctx = new Context();
   }
   function createBinding(key, value) {
     ctx.bind(key).to(value);

packages/loopback/test/acceptance/context-bindings/locking-bindings.ts → packages/ioc/test/acceptance/locking-bindings.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import * as util from 'loopback/test/support/util';
+import {Context} from '../..';
 
 describe('Context bindings - Locking bindings', () => {
   describe('Binding with a duplicate key', () => {
@@ -45,7 +45,7 @@ describe('Context bindings - Locking bindings', () => {
     });
 
     function createContext() {
-      ctx = util.getContext();
+      ctx = new Context();
     }
     function createBinding() {
       binding = ctx.bind('foo');

packages/loopback/test/acceptance/context-bindings/tagged-bindings.ts → packages/ioc/test/acceptance/tagged-bindings.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import * as util from 'loopback/test/support/util';
+import {Context} from '../..';
 
 describe('Context bindings - Tagged bindings', () => {
   let ctx;
@@ -27,7 +27,7 @@ describe('Context bindings - Tagged bindings', () => {
   });
 
   function createContext() {
-    ctx = util.getContext();
+    ctx = new Context();
   }
   function createBinding() {
     binding = ctx.bind('foo').to('bar');

packages/loopback/test/acceptance/context-bindings/unlocking-bindings.ts → packages/ioc/test/acceptance/unlocking-bindings.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import * as util from 'loopback/test/support/util';
+import {Context} from '../..';
 
 describe(`Context bindings - Unlocking bindings`, () => {
   describe('Unlocking a locked binding', () => {
@@ -43,7 +43,7 @@ describe(`Context bindings - Unlocking bindings`, () => {
     });
 
     function createContext() {
-      ctx = util.getContext();
+      ctx = new Context();
     }
     function createLockedBinding() {
       binding = ctx.bind('foo').to('bar');

packages/loopback/test/unit/context/binding.ts → packages/ioc/test/unit/binding.ts

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import {Binding} from 'loopback/lib/context/binding';
+import {Binding} from '../..';
 
 const key = 'foo';
 const binding = new Binding(key);

packages/loopback/test/unit/context/index.ts → packages/ioc/test/unit/context.ts

@@ -4,8 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {expect} from 'testlab';
-import {Binding} from 'loopback/lib/context/binding';
-import * as util from 'loopback/test/support/util';
+import {Context, Binding} from '../..';
 
 describe('Context', () => {
   let ctx;
@@ -43,6 +42,6 @@ describe('Context', () => {
   });
 
   function createContext() {
-    ctx = util.getContext();
+    ctx = new Context();
   }
 });

packages/loopback/lib/application.ts

@@ -3,8 +3,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Binding} from './context/binding';
-import {Context} from './context';
+import {Binding, Context} from '@loopback/ioc';
 import * as http from 'http';
 import {SwaggerRouter} from './router/SwaggerRouter';
 import {getApiSpec} from './router/metadata';

packages/loopback/lib/server.ts

@@ -5,7 +5,7 @@
 
 import http = require('http');
 import bluebird = require('bluebird');
-import {Context} from './context';
+import {Context} from '@loopback/ioc';
 import {Application} from '../lib/application';
 import {SwaggerRouter} from './router/SwaggerRouter';
 

packages/loopback/package.json

@@ -12,6 +12,7 @@
   "author": "IBM",
   "license": "MIT",
   "dependencies": {
+    "@loopback/ioc": "^4.0.0-alpha.1",
     "@loopback/juggler": "^4.0.0-alpha.1",
     "@loopback/remoting": "^4.0.0-alpha.1",
     "body": "^5.1.0",

packages/loopback/test/support/util.ts

@@ -5,7 +5,7 @@
 
 import {Application, Server, ServerConfig} from 'loopback';
 import {Client} from './client';
-import {Context} from '../../lib/context';
+import {Context} from '@loopback/ioc';
 import * as bluebird from 'bluebird';
 import * as http from 'http';