@loopback/context 1.23.5 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/CHANGELOG.md +81 -0
  2. package/dist/binding-config.js +1 -1
  3. package/dist/binding-config.js.map +1 -1
  4. package/dist/binding-filter.d.ts +19 -1
  5. package/dist/binding-filter.js +40 -7
  6. package/dist/binding-filter.js.map +1 -1
  7. package/dist/binding-inspector.js +12 -11
  8. package/dist/binding-inspector.js.map +1 -1
  9. package/dist/binding-sorter.js +2 -2
  10. package/dist/binding-sorter.js.map +1 -1
  11. package/dist/binding.d.ts +42 -4
  12. package/dist/binding.js +40 -10
  13. package/dist/binding.js.map +1 -1
  14. package/dist/context-event.d.ts +23 -0
  15. package/dist/context-event.js +7 -0
  16. package/dist/context-event.js.map +1 -0
  17. package/dist/context-observer.d.ts +1 -36
  18. package/dist/context-subscription.d.ts +147 -0
  19. package/dist/context-subscription.js +336 -0
  20. package/dist/context-subscription.js.map +1 -0
  21. package/dist/context-tag-indexer.d.ts +42 -0
  22. package/dist/context-tag-indexer.js +134 -0
  23. package/dist/context-tag-indexer.js.map +1 -0
  24. package/dist/context-view.d.ts +2 -1
  25. package/dist/context-view.js +5 -2
  26. package/dist/context-view.js.map +1 -1
  27. package/dist/context.d.ts +35 -66
  28. package/dist/context.js +78 -250
  29. package/dist/context.js.map +1 -1
  30. package/dist/index.d.ts +5 -3
  31. package/dist/index.js +4 -3
  32. package/dist/index.js.map +1 -1
  33. package/dist/inject-config.js +3 -3
  34. package/dist/inject-config.js.map +1 -1
  35. package/dist/inject.d.ts +2 -2
  36. package/dist/inject.js +18 -11
  37. package/dist/inject.js.map +1 -1
  38. package/dist/interception-proxy.d.ts +15 -3
  39. package/dist/interception-proxy.js +20 -4
  40. package/dist/interception-proxy.js.map +1 -1
  41. package/dist/interceptor-chain.js +5 -2
  42. package/dist/interceptor-chain.js.map +1 -1
  43. package/dist/interceptor.d.ts +6 -0
  44. package/dist/interceptor.js +38 -12
  45. package/dist/interceptor.js.map +1 -1
  46. package/dist/invocation.d.ts +20 -2
  47. package/dist/invocation.js +14 -12
  48. package/dist/invocation.js.map +1 -1
  49. package/dist/keys.d.ts +6 -0
  50. package/dist/keys.js +6 -0
  51. package/dist/keys.js.map +1 -1
  52. package/dist/resolution-session.d.ts +1 -0
  53. package/dist/resolution-session.js +13 -6
  54. package/dist/resolution-session.js.map +1 -1
  55. package/dist/resolver.js +13 -8
  56. package/dist/resolver.js.map +1 -1
  57. package/dist/value-promise.d.ts +1 -3
  58. package/package.json +9 -9
  59. package/src/binding-config.ts +1 -1
  60. package/src/binding-filter.ts +61 -9
  61. package/src/binding-inspector.ts +6 -8
  62. package/src/binding-sorter.ts +2 -2
  63. package/src/binding.ts +73 -9
  64. package/src/context-event.ts +30 -0
  65. package/src/context-observer.ts +1 -38
  66. package/src/context-subscription.ts +403 -0
  67. package/src/context-tag-indexer.ts +149 -0
  68. package/src/context-view.ts +3 -6
  69. package/src/context.ts +94 -293
  70. package/src/index.ts +5 -3
  71. package/src/inject-config.ts +3 -3
  72. package/src/inject.ts +19 -10
  73. package/src/interception-proxy.ts +25 -3
  74. package/src/interceptor-chain.ts +1 -1
  75. package/src/interceptor.ts +34 -8
  76. package/src/invocation.ts +26 -7
  77. package/src/keys.ts +7 -0
  78. package/src/resolution-session.ts +9 -5
  79. package/src/resolver.ts +5 -5
  80. package/src/value-promise.ts +1 -1
@@ -5,8 +5,8 @@
5
5
 
6
6
  import {Binding} from './binding';
7
7
  import {BindingFilter} from './binding-filter';
8
- import {ValueOrPromise} from './value-promise';
9
8
  import {Context} from './context';
9
+ import {ValueOrPromise} from './value-promise';
10
10
 
11
11
  /**
12
12
  * Context event types. We support `bind` and `unbind` for now but
@@ -48,40 +48,3 @@ export interface ContextObserver {
48
48
  * Context event observer type - An instance of `ContextObserver` or a function
49
49
  */
50
50
  export type ContextEventObserver = ContextObserver | ContextObserverFn;
51
-
52
- /**
53
- * Subscription of context events. It's modeled after
54
- * https://github.com/tc39/proposal-observable.
55
- */
56
- export interface Subscription {
57
- /**
58
- * unsubscribe
59
- */
60
- unsubscribe(): void;
61
- /**
62
- * Is the subscription closed?
63
- */
64
- closed: boolean;
65
- }
66
-
67
- /**
68
- * Event data for observer notifications
69
- */
70
- export type Notification = {
71
- /**
72
- * Context event type - bind/unbind
73
- */
74
- eventType: ContextEventType;
75
- /**
76
- * Binding added/removed
77
- */
78
- binding: Readonly<Binding<unknown>>;
79
- /**
80
- * Owner context for the binding
81
- */
82
- context: Context;
83
- /**
84
- * A snapshot of observers when the original event is emitted
85
- */
86
- observers: Set<ContextEventObserver>;
87
- };
@@ -0,0 +1,403 @@
1
+ // Copyright IBM Corp. 2020. All Rights Reserved.
2
+ // Node module: @loopback/context
3
+ // This file is licensed under the MIT License.
4
+ // License text available at https://opensource.org/licenses/MIT
5
+
6
+ import debugFactory from 'debug';
7
+ import {EventEmitter} from 'events';
8
+ import {Context} from './context';
9
+ import {ContextEvent, ContextEventListener} from './context-event';
10
+ import {
11
+ ContextEventObserver,
12
+ ContextEventType,
13
+ ContextObserver,
14
+ } from './context-observer';
15
+ const debug = debugFactory('loopback:context:subscription');
16
+
17
+ /**
18
+ * Polyfill Symbol.asyncIterator as required by TypeScript for Node 8.x.
19
+ * See https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-3.html
20
+ */
21
+ if (!Symbol.asyncIterator) {
22
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
23
+ (Symbol as any).asyncIterator = Symbol.for('Symbol.asyncIterator');
24
+ }
25
+ /**
26
+ * WARNING: This following import must happen after the polyfill. The
27
+ * `auto-import` by an IDE such as VSCode may move the import before the
28
+ * polyfill. It must be then fixed manually.
29
+ */
30
+ import {iterator, multiple} from 'p-event';
31
+
32
+ /**
33
+ * Subscription of context events. It's modeled after
34
+ * https://github.com/tc39/proposal-observable.
35
+ */
36
+ export interface Subscription {
37
+ /**
38
+ * unsubscribe
39
+ */
40
+ unsubscribe(): void;
41
+ /**
42
+ * Is the subscription closed?
43
+ */
44
+ closed: boolean;
45
+ }
46
+
47
+ /**
48
+ * Event data for observer notifications
49
+ */
50
+ export interface Notification extends ContextEvent {
51
+ /**
52
+ * A snapshot of observers when the original event is emitted
53
+ */
54
+ observers: Set<ContextEventObserver>;
55
+ }
56
+
57
+ /**
58
+ * An implementation of `Subscription` interface for context events
59
+ */
60
+ class ContextSubscription implements Subscription {
61
+ constructor(
62
+ protected context: Context,
63
+ protected observer: ContextEventObserver,
64
+ ) {}
65
+
66
+ private _closed = false;
67
+
68
+ unsubscribe() {
69
+ this.context.unsubscribe(this.observer);
70
+ this._closed = true;
71
+ }
72
+
73
+ get closed() {
74
+ return this._closed;
75
+ }
76
+ }
77
+
78
+ /**
79
+ * Manager for context observer subscriptions
80
+ */
81
+ export class ContextSubscriptionManager extends EventEmitter {
82
+ /**
83
+ * A listener to watch parent context events
84
+ */
85
+ protected _parentContextEventListener?: ContextEventListener;
86
+
87
+ /**
88
+ * A list of registered context observers. The Set will be created when the
89
+ * first observer is added.
90
+ */
91
+ protected _observers: Set<ContextEventObserver> | undefined;
92
+
93
+ /**
94
+ * Internal counter for pending notification events which are yet to be
95
+ * processed by observers.
96
+ */
97
+ private pendingNotifications = 0;
98
+
99
+ /**
100
+ * Queue for background notifications for observers
101
+ */
102
+ private notificationQueue: AsyncIterableIterator<Notification> | undefined;
103
+
104
+ constructor(protected readonly context: Context) {
105
+ super();
106
+ this.setMaxListeners(Infinity);
107
+ }
108
+
109
+ /**
110
+ * @internal
111
+ */
112
+ get parentContextEventListener() {
113
+ return this._parentContextEventListener;
114
+ }
115
+
116
+ /**
117
+ * @internal
118
+ */
119
+ get observers() {
120
+ return this._observers;
121
+ }
122
+
123
+ /**
124
+ * Wrap the debug statement so that it always print out the context name
125
+ * as the prefix
126
+ * @param args - Arguments for the debug
127
+ */
128
+ private _debug(...args: unknown[]) {
129
+ /* istanbul ignore if */
130
+ if (!debug.enabled) return;
131
+ const formatter = args.shift();
132
+ if (typeof formatter === 'string') {
133
+ debug(`[%s] ${formatter}`, this.context.name, ...args);
134
+ } else {
135
+ debug('[%s] ', this.context.name, formatter, ...args);
136
+ }
137
+ }
138
+
139
+ /**
140
+ * Set up an internal listener to notify registered observers asynchronously
141
+ * upon `bind` and `unbind` events. This method will be called lazily when
142
+ * the first observer is added.
143
+ */
144
+ private setupEventHandlersIfNeeded() {
145
+ if (this.notificationQueue != null) return;
146
+
147
+ if (this.context.parent != null) {
148
+ /**
149
+ * Add an event listener to its parent context so that this context will
150
+ * be notified of parent events, such as `bind` or `unbind`.
151
+ */
152
+ this._parentContextEventListener = event => {
153
+ this.handleParentEvent(event);
154
+ };
155
+
156
+ // Listen on the parent context events
157
+ this.context.parent.on('bind', this._parentContextEventListener!);
158
+ this.context.parent.on('unbind', this._parentContextEventListener!);
159
+ }
160
+
161
+ // The following are two async functions. Returned promises are ignored as
162
+ // they are long-running background tasks.
163
+ this.startNotificationTask().catch(err => {
164
+ this.handleNotificationError(err);
165
+ });
166
+
167
+ let ctx = this.context.parent;
168
+ while (ctx) {
169
+ ctx.subscriptionManager.setupEventHandlersIfNeeded();
170
+ ctx = ctx.parent;
171
+ }
172
+ }
173
+
174
+ private handleParentEvent(event: ContextEvent) {
175
+ const {binding, context, type} = event;
176
+ // Propagate the event to this context only if the binding key does not
177
+ // exist in this context. The parent binding is shadowed if there is a
178
+ // binding with the same key in this one.
179
+ if (this.context.contains(binding.key)) {
180
+ this._debug(
181
+ 'Event %s %s is not re-emitted from %s to %s',
182
+ type,
183
+ binding.key,
184
+ context.name,
185
+ this.context.name,
186
+ );
187
+ return;
188
+ }
189
+ this._debug(
190
+ 'Re-emitting %s %s from %s to %s',
191
+ type,
192
+ binding.key,
193
+ context.name,
194
+ this.context.name,
195
+ );
196
+ this.context.emitEvent(type, event);
197
+ }
198
+
199
+ /**
200
+ * A strongly-typed method to emit context events
201
+ * @param type Event type
202
+ * @param event Context event
203
+ */
204
+ private emitEvent<T extends ContextEvent>(type: string, event: T) {
205
+ this.emit(type, event);
206
+ }
207
+
208
+ /**
209
+ * Emit an `error` event
210
+ * @param err Error
211
+ */
212
+ private emitError(err: unknown) {
213
+ this.emit('error', err);
214
+ }
215
+
216
+ /**
217
+ * Start a background task to listen on context events and notify observers
218
+ */
219
+ private startNotificationTask() {
220
+ // Set up listeners on `bind` and `unbind` for notifications
221
+ this.setupNotification('bind', 'unbind');
222
+
223
+ // Create an async iterator for the `notification` event as a queue
224
+ this.notificationQueue = iterator(this, 'notification');
225
+
226
+ return this.processNotifications();
227
+ }
228
+
229
+ /**
230
+ * Publish an event to the registered observers. Please note the
231
+ * notification is queued and performed asynchronously so that we allow fluent
232
+ * APIs such as `ctx.bind('key').to(...).tag(...);` and give observers the
233
+ * fully populated binding.
234
+ *
235
+ * @param event - Context event
236
+ * @param observers - Current set of context observers
237
+ */
238
+ protected async notifyObservers(
239
+ event: ContextEvent,
240
+ observers = this._observers,
241
+ ) {
242
+ if (!observers || observers.size === 0) return;
243
+
244
+ const {type, binding, context} = event;
245
+ for (const observer of observers) {
246
+ if (typeof observer === 'function') {
247
+ await observer(type, binding, context);
248
+ } else if (!observer.filter || observer.filter(binding)) {
249
+ await observer.observe(type, binding, context);
250
+ }
251
+ }
252
+ }
253
+
254
+ /**
255
+ * Process notification events as they arrive on the queue
256
+ */
257
+ private async processNotifications() {
258
+ const events = this.notificationQueue;
259
+ if (events == null) return;
260
+ for await (const {type, binding, context, observers} of events) {
261
+ // The loop will happen asynchronously upon events
262
+ try {
263
+ // The execution of observers happen in the Promise micro-task queue
264
+ await this.notifyObservers({type, binding, context}, observers);
265
+ this.pendingNotifications--;
266
+ this._debug(
267
+ 'Observers notified for %s of binding %s',
268
+ type,
269
+ binding.key,
270
+ );
271
+ this.emitEvent('observersNotified', {type, binding, context});
272
+ } catch (err) {
273
+ this.pendingNotifications--;
274
+ this._debug('Error caught from observers', err);
275
+ // Errors caught from observers. Emit it to the current context.
276
+ // If no error listeners are registered, crash the process.
277
+ this.emitError(err);
278
+ }
279
+ }
280
+ }
281
+
282
+ /**
283
+ * Listen on given event types and emit `notification` event. This method
284
+ * merge multiple event types into one for notification.
285
+ * @param eventTypes - Context event types
286
+ */
287
+ private setupNotification(...eventTypes: ContextEventType[]) {
288
+ for (const type of eventTypes) {
289
+ this.context.on(type, ({binding, context}) => {
290
+ // No need to schedule notifications if no observers are present
291
+ if (!this._observers || this._observers.size === 0) return;
292
+ // Track pending events
293
+ this.pendingNotifications++;
294
+ // Take a snapshot of current observers to ensure notifications of this
295
+ // event will only be sent to current ones. Emit a new event to notify
296
+ // current context observers.
297
+ this.emitEvent('notification', {
298
+ type,
299
+ binding,
300
+ context,
301
+ observers: new Set(this._observers),
302
+ });
303
+ });
304
+ }
305
+ }
306
+
307
+ /**
308
+ * Wait until observers are notified for all of currently pending notification
309
+ * events.
310
+ *
311
+ * This method is for test only to perform assertions after observers are
312
+ * notified for relevant events.
313
+ */
314
+ async waitUntilPendingNotificationsDone(timeout?: number) {
315
+ const count = this.pendingNotifications;
316
+ if (count === 0) return;
317
+ await multiple(this, 'observersNotified', {count, timeout});
318
+ }
319
+
320
+ /**
321
+ * Add a context event observer to the context
322
+ * @param observer - Context observer instance or function
323
+ */
324
+ subscribe(observer: ContextEventObserver): Subscription {
325
+ this._observers = this._observers ?? new Set();
326
+ this.setupEventHandlersIfNeeded();
327
+ this._observers.add(observer);
328
+ return new ContextSubscription(this.context, observer);
329
+ }
330
+
331
+ /**
332
+ * Remove the context event observer from the context
333
+ * @param observer - Context event observer
334
+ */
335
+ unsubscribe(observer: ContextEventObserver): boolean {
336
+ if (!this._observers) return false;
337
+ return this._observers.delete(observer);
338
+ }
339
+
340
+ /**
341
+ * Check if an observer is subscribed to this context
342
+ * @param observer - Context observer
343
+ */
344
+ isSubscribed(observer: ContextObserver) {
345
+ if (!this._observers) return false;
346
+ return this._observers.has(observer);
347
+ }
348
+
349
+ /**
350
+ * Handle errors caught during the notification of observers
351
+ * @param err - Error
352
+ */
353
+ private handleNotificationError(err: unknown) {
354
+ // Bubbling up the error event over the context chain
355
+ // until we find an error listener
356
+ let ctx: Context | undefined = this.context;
357
+ while (ctx) {
358
+ if (ctx.listenerCount('error') === 0) {
359
+ // No error listener found, try its parent
360
+ ctx = ctx.parent;
361
+ continue;
362
+ }
363
+ this._debug('Emitting error to context %s', ctx.name, err);
364
+ ctx.emitError(err);
365
+ return;
366
+ }
367
+ // No context with error listeners found
368
+ this._debug('No error handler is configured for the context chain', err);
369
+ // Let it crash now by emitting an error event
370
+ this.context.emitError(err);
371
+ }
372
+
373
+ /**
374
+ * Close the context: clear observers, stop notifications, and remove event
375
+ * listeners from its parent context.
376
+ *
377
+ * @remarks
378
+ * This method MUST be called to avoid memory leaks once a context object is
379
+ * no longer needed and should be recycled. An example is the `RequestContext`,
380
+ * which is created per request.
381
+ */
382
+ close() {
383
+ this._observers = undefined;
384
+ if (this.notificationQueue != null) {
385
+ // Cancel the notification iterator
386
+ this.notificationQueue.return!(undefined).catch(err => {
387
+ this.handleNotificationError(err);
388
+ });
389
+ this.notificationQueue = undefined;
390
+ }
391
+ if (this.context.parent && this._parentContextEventListener) {
392
+ this.context.parent.removeListener(
393
+ 'bind',
394
+ this._parentContextEventListener,
395
+ );
396
+ this.context.parent.removeListener(
397
+ 'unbind',
398
+ this._parentContextEventListener,
399
+ );
400
+ this._parentContextEventListener = undefined;
401
+ }
402
+ }
403
+ }
@@ -0,0 +1,149 @@
1
+ // Copyright IBM Corp. 2020. All Rights Reserved.
2
+ // Node module: @loopback/context
3
+ // This file is licensed under the MIT License.
4
+ // License text available at https://opensource.org/licenses/MIT
5
+
6
+ import {Binding, BindingEventListener, BindingTag} from './binding';
7
+ import {BindingFilter, filterByTag} from './binding-filter';
8
+ import {Context} from './context';
9
+ import {ContextEventListener} from './context-event';
10
+ import {BoundValue} from './value-promise';
11
+
12
+ /**
13
+ * Indexer for context bindings by tag
14
+ */
15
+ export class ContextTagIndexer {
16
+ /**
17
+ * Index for bindings by tag names
18
+ */
19
+ readonly bindingsIndexedByTag: Map<
20
+ string,
21
+ Set<Readonly<Binding<unknown>>>
22
+ > = new Map();
23
+
24
+ /**
25
+ * A listener for binding events
26
+ */
27
+ private bindingEventListener: BindingEventListener;
28
+
29
+ /**
30
+ * A listener to maintain tag index for bindings
31
+ */
32
+ private tagIndexListener: ContextEventListener;
33
+
34
+ constructor(protected readonly context: Context) {
35
+ this.setupTagIndexForBindings();
36
+ }
37
+
38
+ /**
39
+ * Set up context/binding listeners and refresh index for bindings by tag
40
+ */
41
+ private setupTagIndexForBindings() {
42
+ this.bindingEventListener = ({binding, operation}) => {
43
+ if (operation === 'tag') {
44
+ this.updateTagIndexForBinding(binding);
45
+ }
46
+ };
47
+ this.tagIndexListener = event => {
48
+ const {binding, type} = event;
49
+ if (event.context !== this.context) return;
50
+ if (type === 'bind') {
51
+ this.updateTagIndexForBinding(binding);
52
+ binding.on('changed', this.bindingEventListener);
53
+ } else if (type === 'unbind') {
54
+ this.removeTagIndexForBinding(binding);
55
+ binding.removeListener('changed', this.bindingEventListener);
56
+ }
57
+ };
58
+ this.context.on('bind', this.tagIndexListener);
59
+ this.context.on('unbind', this.tagIndexListener);
60
+ }
61
+
62
+ /**
63
+ * Remove tag index for the given binding
64
+ * @param binding - Binding object
65
+ */
66
+ private removeTagIndexForBinding(binding: Readonly<Binding<unknown>>) {
67
+ for (const [, bindings] of this.bindingsIndexedByTag) {
68
+ bindings.delete(binding);
69
+ }
70
+ }
71
+
72
+ /**
73
+ * Update tag index for the given binding
74
+ * @param binding - Binding object
75
+ */
76
+ private updateTagIndexForBinding(binding: Readonly<Binding<unknown>>) {
77
+ this.removeTagIndexForBinding(binding);
78
+ for (const tag of binding.tagNames) {
79
+ let bindings = this.bindingsIndexedByTag.get(tag);
80
+ if (bindings == null) {
81
+ bindings = new Set();
82
+ this.bindingsIndexedByTag.set(tag, bindings);
83
+ }
84
+ bindings.add(binding);
85
+ }
86
+ }
87
+
88
+ /**
89
+ * Find bindings by tag leveraging indexes
90
+ * @param tag - Tag name pattern or name/value pairs
91
+ */
92
+ findByTagIndex<ValueType = BoundValue>(
93
+ tag: BindingTag | RegExp,
94
+ ): Readonly<Binding<ValueType>>[] {
95
+ let tagNames: string[];
96
+ // A flag to control if a union of matched bindings should be created
97
+ let union = false;
98
+ if (tag instanceof RegExp) {
99
+ // For wildcard/regexp, a union of matched bindings is desired
100
+ union = true;
101
+ // Find all matching tag names
102
+ tagNames = [];
103
+ for (const t of this.bindingsIndexedByTag.keys()) {
104
+ if (tag.test(t)) {
105
+ tagNames.push(t);
106
+ }
107
+ }
108
+ } else if (typeof tag === 'string') {
109
+ tagNames = [tag];
110
+ } else {
111
+ tagNames = Object.keys(tag);
112
+ }
113
+ let filter: BindingFilter | undefined;
114
+ let bindings: Set<Readonly<Binding<ValueType>>> | undefined;
115
+ for (const t of tagNames) {
116
+ const bindingsByTag = this.bindingsIndexedByTag.get(t);
117
+ if (bindingsByTag == null) break; // One of the tags is not found
118
+ filter = filter ?? filterByTag(tag);
119
+ const matched = new Set(Array.from(bindingsByTag).filter(filter)) as Set<
120
+ Readonly<Binding<ValueType>>
121
+ >;
122
+ if (!union && matched.size === 0) break; // One of the tag name/value is not found
123
+ if (bindings == null) {
124
+ // First set of bindings matching the tag
125
+ bindings = matched;
126
+ } else {
127
+ if (union) {
128
+ matched.forEach(b => bindings?.add(b));
129
+ } else {
130
+ // Now need to find intersected bindings against visited tags
131
+ const intersection = new Set<Readonly<Binding<ValueType>>>();
132
+ bindings.forEach(b => {
133
+ if (matched.has(b)) {
134
+ intersection.add(b);
135
+ }
136
+ });
137
+ bindings = intersection;
138
+ }
139
+ if (!union && bindings.size === 0) break;
140
+ }
141
+ }
142
+ return bindings == null ? [] : Array.from(bindings);
143
+ }
144
+
145
+ close() {
146
+ this.context.removeListener('bind', this.tagIndexListener);
147
+ this.context.removeListener('unbind', this.tagIndexListener);
148
+ }
149
+ }
@@ -3,18 +3,15 @@
3
3
  // This file is licensed under the MIT License.
4
4
  // License text available at https://opensource.org/licenses/MIT
5
5
 
6
- import * as debugFactory from 'debug';
6
+ import debugFactory from 'debug';
7
7
  import {EventEmitter} from 'events';
8
8
  import {promisify} from 'util';
9
9
  import {Binding} from './binding';
10
10
  import {BindingFilter} from './binding-filter';
11
11
  import {BindingComparator} from './binding-sorter';
12
12
  import {Context} from './context';
13
- import {
14
- ContextEventType,
15
- ContextObserver,
16
- Subscription,
17
- } from './context-observer';
13
+ import {ContextEventType, ContextObserver} from './context-observer';
14
+ import {Subscription} from './context-subscription';
18
15
  import {Getter} from './inject';
19
16
  import {ResolutionSession} from './resolution-session';
20
17
  import {isPromiseLike, resolveList, ValueOrPromise} from './value-promise';