@shrub/core 0.5.26 → 0.5.30
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.
- package/dist/esm/service-collection.js +110 -101
- package/dist/service-collection.d.ts +44 -23
- package/dist/service-collection.js +110 -101
- package/package.json +2 -2
|
@@ -110,13 +110,18 @@ export class SingletonServiceFactory {
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
export class ServiceMap {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
this
|
|
118
|
-
|
|
119
|
-
|
|
113
|
+
/** Creates a new ServiceMap instance; note: the services parameter is for internal purposes and should not be used. */
|
|
114
|
+
constructor(services = new Map()) {
|
|
115
|
+
this.services = services;
|
|
116
|
+
this.instances = new Map();
|
|
117
|
+
// assume this is a scoped service if the provided map already has entries
|
|
118
|
+
if (!services.size) {
|
|
119
|
+
// the thisFactory is used to return the appropriate ServiceMap instance since the IInstantiationService and IServiceCollection services need to be scoped
|
|
120
|
+
const thisFactory = { create: service => service };
|
|
121
|
+
this.registerService(IInstantiationService, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
122
|
+
this.registerService(IServiceCollection, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
123
|
+
this.registerSingleton(IOptionsService, OptionsService, { sealed: true });
|
|
124
|
+
}
|
|
120
125
|
}
|
|
121
126
|
addOptionsProvider(provider) {
|
|
122
127
|
return this.get(IOptionsService).addOptionsProvider(provider);
|
|
@@ -129,97 +134,76 @@ export class ServiceMap {
|
|
|
129
134
|
}
|
|
130
135
|
createScope() {
|
|
131
136
|
const parent = this;
|
|
137
|
+
const getOrCreateServiceInstanceFromParent = this.getOrCreateServiceInstance.bind(this);
|
|
132
138
|
return new class extends ServiceMap {
|
|
133
139
|
constructor() {
|
|
134
|
-
super();
|
|
135
|
-
// The service map registers a few built-in services that need to be handled a little differently
|
|
136
|
-
// -- if the service is singleton/instance it gets copied from the parent
|
|
137
|
-
// -- if the service is scoped/transient do not overwrite the entry from the parent
|
|
138
|
-
for (const entry of parent.services.values()) {
|
|
139
|
-
if (entry.scope === "singleton" /* singleton */ || entry.scope === "instance" /* instance */) {
|
|
140
|
-
// copy the singleton entry directly to the scoped collection - it's possible the instance has not yet been created so the entire entry gets copied down
|
|
141
|
-
this.registerEntry(entry);
|
|
142
|
-
}
|
|
143
|
-
else if (!this.services.has(entry.service.key)) {
|
|
144
|
-
// create a new entry for scoped/transient services
|
|
145
|
-
this.registerEntry({ ...entry, instance: undefined });
|
|
146
|
-
}
|
|
147
|
-
}
|
|
140
|
+
super(parent.services);
|
|
148
141
|
this.freeze();
|
|
149
142
|
}
|
|
150
143
|
dispose() {
|
|
151
|
-
for (const
|
|
152
|
-
//
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
service.instance.dispose();
|
|
144
|
+
for (const instance of this.instances.values()) {
|
|
145
|
+
// dispose instances created and referenced by the scope; this will be scoped and transient instances
|
|
146
|
+
// also make sure we don't dispose the current instance as that will cause a stack overflow
|
|
147
|
+
if (instance !== this && isDisposable(instance)) {
|
|
148
|
+
instance.dispose();
|
|
157
149
|
}
|
|
158
150
|
}
|
|
159
|
-
this.
|
|
151
|
+
this.instances.clear();
|
|
152
|
+
}
|
|
153
|
+
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
154
|
+
const entry = this.services.get(key);
|
|
155
|
+
if (entry !== undefined && (entry.scope === "singleton" /* singleton */ || entry.scope === "instance" /* instance */)) {
|
|
156
|
+
// if the service is an instance or singleton call up the parent chain and get the instance from the root
|
|
157
|
+
return getOrCreateServiceInstanceFromParent(key, rootScope, ancestors);
|
|
158
|
+
}
|
|
159
|
+
return super.getOrCreateServiceInstance(key, rootScope, ancestors);
|
|
160
160
|
}
|
|
161
161
|
};
|
|
162
162
|
}
|
|
163
163
|
getOptions(options) {
|
|
164
164
|
return this.get(IOptionsService).getOptions(options);
|
|
165
165
|
}
|
|
166
|
-
register(service, ctor) {
|
|
167
|
-
this.registerService(service, getServiceScope(ctor), ctor);
|
|
166
|
+
register(service, ctor, options) {
|
|
167
|
+
this.registerService(service, getServiceScope(ctor), ctor, options);
|
|
168
168
|
}
|
|
169
|
-
registerInstance(service, instance) {
|
|
169
|
+
registerInstance(service, instance, options) {
|
|
170
170
|
if (instance === undefined) {
|
|
171
171
|
throw new Error("instance undefined");
|
|
172
172
|
}
|
|
173
173
|
// TODO: check if the instance constructor has a required scope - if so, verify its a singleton
|
|
174
|
-
this.
|
|
175
|
-
|
|
176
|
-
scope: "instance" /* instance */,
|
|
177
|
-
instance
|
|
178
|
-
});
|
|
174
|
+
this.instances.set(service.key, instance);
|
|
175
|
+
this.services.set(service.key, { service, scope: "instance" /* instance */, sealed: options && options.sealed });
|
|
179
176
|
}
|
|
180
|
-
registerScoped(service, ctorOrFactory) {
|
|
181
|
-
this.registerService(service, "scoped" /* scoped */, ctorOrFactory);
|
|
177
|
+
registerScoped(service, ctorOrFactory, options) {
|
|
178
|
+
this.registerService(service, "scoped" /* scoped */, ctorOrFactory, options);
|
|
182
179
|
}
|
|
183
|
-
registerSingleton(service, ctorOrFactory) {
|
|
184
|
-
this.registerService(service, "singleton" /* singleton */, ctorOrFactory);
|
|
180
|
+
registerSingleton(service, ctorOrFactory, options) {
|
|
181
|
+
this.registerService(service, "singleton" /* singleton */, ctorOrFactory, options);
|
|
185
182
|
}
|
|
186
|
-
registerTransient(service, ctorOrFactory) {
|
|
187
|
-
this.registerService(service, "transient" /* transient */, ctorOrFactory);
|
|
183
|
+
registerTransient(service, ctorOrFactory, options) {
|
|
184
|
+
this.registerService(service, "transient" /* transient */, ctorOrFactory, options);
|
|
188
185
|
}
|
|
189
|
-
tryRegister(service, ctor) {
|
|
190
|
-
|
|
191
|
-
this.register(service, ctor);
|
|
192
|
-
return true;
|
|
193
|
-
}
|
|
194
|
-
return false;
|
|
186
|
+
tryRegister(service, ctor, options) {
|
|
187
|
+
return this.tryRegisterService(service, getServiceScope(ctor), ctor, options) === "success";
|
|
195
188
|
}
|
|
196
|
-
tryRegisterInstance(service, instance) {
|
|
197
|
-
|
|
198
|
-
|
|
189
|
+
tryRegisterInstance(service, instance, options) {
|
|
190
|
+
try {
|
|
191
|
+
// TODO: refactor -- need to invoke registerInstance because it registers the instance
|
|
192
|
+
this.registerInstance(service, instance, options);
|
|
199
193
|
return true;
|
|
200
194
|
}
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
tryRegisterScoped(service, ctorOrFactory) {
|
|
204
|
-
if (!this.services.has(service.key)) {
|
|
205
|
-
this.registerScoped(service, ctorOrFactory);
|
|
206
|
-
return true;
|
|
195
|
+
catch {
|
|
196
|
+
return false;
|
|
207
197
|
}
|
|
208
|
-
return false;
|
|
209
198
|
}
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
this.registerSingleton(service, ctorOrFactory);
|
|
213
|
-
return true;
|
|
214
|
-
}
|
|
215
|
-
return false;
|
|
199
|
+
tryRegisterScoped(service, ctorOrFactory, options) {
|
|
200
|
+
return this.tryRegisterService(service, "scoped" /* scoped */, ctorOrFactory, options) === "success";
|
|
216
201
|
}
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
return false;
|
|
202
|
+
tryRegisterSingleton(service, ctorOrFactory, options) {
|
|
203
|
+
return this.tryRegisterService(service, "singleton" /* singleton */, ctorOrFactory, options) === "success";
|
|
204
|
+
}
|
|
205
|
+
tryRegisterTransient(service, ctorOrFactory, options) {
|
|
206
|
+
return this.tryRegisterService(service, "transient" /* transient */, ctorOrFactory, options) === "success";
|
|
223
207
|
}
|
|
224
208
|
get(serviceOrKey) {
|
|
225
209
|
const key = typeof serviceOrKey === "string" ? serviceOrKey : serviceOrKey.key;
|
|
@@ -239,22 +223,46 @@ export class ServiceMap {
|
|
|
239
223
|
freeze() {
|
|
240
224
|
this.isFrozen = true;
|
|
241
225
|
}
|
|
242
|
-
|
|
243
|
-
this.
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
226
|
+
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
227
|
+
const entry = this.services.get(key);
|
|
228
|
+
if (!entry) {
|
|
229
|
+
throw new Error(`Service not registered for key '${key}'.`);
|
|
230
|
+
}
|
|
231
|
+
let current = this.instances.get(key);
|
|
232
|
+
if (current) {
|
|
233
|
+
return current;
|
|
234
|
+
}
|
|
235
|
+
const instance = this.createServiceInstance(entry, rootScope, ancestors);
|
|
236
|
+
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
237
|
+
this.instances.set(key, instance);
|
|
238
|
+
}
|
|
239
|
+
return instance;
|
|
249
240
|
}
|
|
250
|
-
|
|
251
|
-
|
|
241
|
+
registerService(service, scope, ctorOrFactory, options) {
|
|
242
|
+
const result = this.tryRegisterService(service, scope, ctorOrFactory, options);
|
|
243
|
+
if (result === "frozen") {
|
|
252
244
|
throw new Error("Service collection is frozen");
|
|
253
245
|
}
|
|
254
|
-
if (
|
|
255
|
-
|
|
246
|
+
if (result === "sealed") {
|
|
247
|
+
throw new Error(`Service with key (${service.key}) cannot be overridden.`);
|
|
256
248
|
}
|
|
257
|
-
|
|
249
|
+
}
|
|
250
|
+
tryRegisterService(service, scope, ctorOrFactory, options) {
|
|
251
|
+
if (this.isFrozen === true) {
|
|
252
|
+
return "frozen";
|
|
253
|
+
}
|
|
254
|
+
const current = this.services.get(service.key);
|
|
255
|
+
if (current && current.sealed) {
|
|
256
|
+
return "sealed";
|
|
257
|
+
}
|
|
258
|
+
const ctor = isConstructor(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
259
|
+
const factory = isServiceFactory(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
260
|
+
const sealed = options && options.sealed;
|
|
261
|
+
if (ctor) {
|
|
262
|
+
this.checkInstanceScope(ctor, scope);
|
|
263
|
+
}
|
|
264
|
+
this.services.set(service.key, { service, scope, ctor, factory, sealed });
|
|
265
|
+
return "success";
|
|
258
266
|
}
|
|
259
267
|
checkFactoryInstance(instance, scope) {
|
|
260
268
|
if (typeof instance !== "object" && typeof instance !== "function") {
|
|
@@ -270,30 +278,23 @@ export class ServiceMap {
|
|
|
270
278
|
throw new Error("Registered service scope is different than the instance required scope");
|
|
271
279
|
}
|
|
272
280
|
}
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
if (entry.instance) {
|
|
279
|
-
return entry.instance;
|
|
280
|
-
}
|
|
281
|
-
const instance = this.createServiceInstance(entry, ancestors);
|
|
282
|
-
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
283
|
-
entry.instance = instance;
|
|
281
|
+
checkParentChildScopes(parentScope, childScope) {
|
|
282
|
+
if (!parentScope || parentScope === "instance" /* instance */ || parentScope === "singleton" /* singleton */) {
|
|
283
|
+
if (childScope === "scoped" /* scoped */) {
|
|
284
|
+
throw new Error("Scoped services should only be referenced by Transient or other Scoped services.");
|
|
285
|
+
}
|
|
284
286
|
}
|
|
285
|
-
return instance;
|
|
286
287
|
}
|
|
287
|
-
getOrCreateInjectable(injectable, ancestors) {
|
|
288
|
+
getOrCreateInjectable(injectable, rootScope, ancestors) {
|
|
288
289
|
if (this.services.has(injectable.key)) {
|
|
289
|
-
return this.getOrCreateServiceInstance(injectable.key, ancestors);
|
|
290
|
+
return this.getOrCreateServiceInstance(injectable.key, rootScope, ancestors);
|
|
290
291
|
}
|
|
291
292
|
if (injectable.factory) {
|
|
292
293
|
return injectable.factory(this);
|
|
293
294
|
}
|
|
294
295
|
throw new Error(`Invalid injectable (${injectable.key}), either a service has not been registered or the injectable does not define a factory.`);
|
|
295
296
|
}
|
|
296
|
-
createServiceInstance(entry, ancestors) {
|
|
297
|
+
createServiceInstance(entry, rootScope, ancestors) {
|
|
297
298
|
if (entry.factory) {
|
|
298
299
|
const instance = entry.factory.create(this);
|
|
299
300
|
// even though the scope cannot be verified until now it is still a good idea to check that the service instance is being properly scoped
|
|
@@ -301,11 +302,11 @@ export class ServiceMap {
|
|
|
301
302
|
return instance;
|
|
302
303
|
}
|
|
303
304
|
if (entry.ctor) {
|
|
304
|
-
return this.createObjectInstance(entry.ctor, ancestors);
|
|
305
|
+
return this.createObjectInstance(entry.ctor, rootScope, ancestors);
|
|
305
306
|
}
|
|
306
307
|
throw new Error("Invalid service entry.");
|
|
307
308
|
}
|
|
308
|
-
createObjectInstance(ctor, ancestors) {
|
|
309
|
+
createObjectInstance(ctor, rootScope, ancestors) {
|
|
309
310
|
if (ancestors && ancestors.includes(ctor)) {
|
|
310
311
|
const path = [...ancestors.map(ctor => ctor.name), ctor.name].join(" -> ");
|
|
311
312
|
throw new Error("Circular dependency detected: " + path);
|
|
@@ -316,10 +317,18 @@ export class ServiceMap {
|
|
|
316
317
|
throw new Error(`Invalid constructor (${ctor.name}), all parameters must be injectable.`);
|
|
317
318
|
}
|
|
318
319
|
try {
|
|
320
|
+
// root scope is used to ensure service dependecies are properly scoped -- mainly, singleton services should not reference scoped services
|
|
321
|
+
rootScope = rootScope || ctor[scope];
|
|
322
|
+
// ancestors is used to track circular dependencies
|
|
319
323
|
ancestors = ancestors || [];
|
|
320
324
|
ancestors.push(ctor);
|
|
321
325
|
// create/get instances for all the object's constructor parameters
|
|
322
|
-
const args = keys.map(key =>
|
|
326
|
+
const args = keys.map(key => {
|
|
327
|
+
const injectable = dependencies[key];
|
|
328
|
+
const entry = this.services.get(injectable.key);
|
|
329
|
+
this.checkParentChildScopes(rootScope, entry && entry.scope);
|
|
330
|
+
return this.getOrCreateInjectable(injectable, rootScope, ancestors);
|
|
331
|
+
});
|
|
323
332
|
ancestors.splice(ancestors.indexOf(ctor), 1);
|
|
324
333
|
return new ctor(...args);
|
|
325
334
|
}
|
|
@@ -379,4 +388,4 @@ class OptionsService {
|
|
|
379
388
|
return options;
|
|
380
389
|
}
|
|
381
390
|
}
|
|
382
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../../src/service-collection.ts"],"names":[],"mappings":"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"}
|
|
391
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../../src/service-collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,27 +41,32 @@ export interface IOptionsService {
|
|
|
41
41
|
export interface IOptionsProvider {
|
|
42
42
|
tryGet<T>(id: IOptions<T>): T | undefined;
|
|
43
43
|
}
|
|
44
|
+
/** Defines options when registering a service. */
|
|
45
|
+
export interface IServiceRegistrationOptions {
|
|
46
|
+
/** True if the service entry cannot be overriden; the default is false. */
|
|
47
|
+
readonly sealed?: boolean;
|
|
48
|
+
}
|
|
44
49
|
export interface IServiceRegistration {
|
|
45
50
|
/** Registers a service using its required scope. Note: a service class must define a required scope decorator. */
|
|
46
|
-
register<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance
|
|
51
|
+
register<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
47
52
|
/** Registers a singleton instance that lives within the collection and is available to all child scopes. Note: if the instance implements IDisposable it will not be disposed automatically. */
|
|
48
|
-
registerInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance): void;
|
|
53
|
+
registerInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance, options?: IServiceRegistrationOptions): void;
|
|
49
54
|
/** Registers a service that gets created once per service collection scope. */
|
|
50
|
-
registerScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
55
|
+
registerScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
51
56
|
/** Registers a service that gets created once and is available to all child scopes. */
|
|
52
|
-
registerSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
57
|
+
registerSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
53
58
|
/** Registers a service that gets created each time the service is requested from a collection. */
|
|
54
|
-
registerTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
59
|
+
registerTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
55
60
|
/** Attempts to register a service using its required scope but only if a service has not already been registered. Note: a service class must define a required scope decorator. */
|
|
56
|
-
tryRegister<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance
|
|
61
|
+
tryRegister<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
57
62
|
/** Attempts to register a singleton instance that lives within the collection and is available to all child scopes. Note: if the instance implements IDisposable it will not be disposed automatically. */
|
|
58
|
-
tryRegisterInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance): boolean;
|
|
63
|
+
tryRegisterInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance, options?: IServiceRegistrationOptions): boolean;
|
|
59
64
|
/** Attempts to register a service that gets created once per service collection scope. */
|
|
60
|
-
tryRegisterScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
65
|
+
tryRegisterScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
61
66
|
/** Attempts to register a service that gets created once and is available to all child scopes. */
|
|
62
|
-
tryRegisterSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
67
|
+
tryRegisterSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
63
68
|
/** Attempts to register a service that gets created each time the service is requested from a collection. */
|
|
64
|
-
tryRegisterTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
69
|
+
tryRegisterTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
65
70
|
}
|
|
66
71
|
export interface IServiceCollection {
|
|
67
72
|
/** Creates a scoped collection. */
|
|
@@ -78,9 +83,22 @@ export interface IServiceFactory<T> {
|
|
|
78
83
|
}
|
|
79
84
|
export interface IScopedServiceCollection extends IServiceCollection, IDisposable {
|
|
80
85
|
}
|
|
86
|
+
interface IServiceEntry<T = any> {
|
|
87
|
+
readonly service: IService<T>;
|
|
88
|
+
readonly scope: ServiceScope;
|
|
89
|
+
readonly ctor?: Constructor<T>;
|
|
90
|
+
readonly factory?: IServiceFactory<T>;
|
|
91
|
+
readonly sealed?: boolean;
|
|
92
|
+
}
|
|
81
93
|
export declare const IInstantiationService: IService<IInstantiationService>;
|
|
82
94
|
export declare const IOptionsService: IService<IOptionsService>;
|
|
83
95
|
export declare const IServiceCollection: IService<IServiceCollection>;
|
|
96
|
+
declare const enum ServiceScope {
|
|
97
|
+
instance = "instance",
|
|
98
|
+
scoped = "scoped",
|
|
99
|
+
singleton = "singleton",
|
|
100
|
+
transient = "transient"
|
|
101
|
+
}
|
|
84
102
|
/** Class decorator identifying the required scope for a service as 'scoped'. */
|
|
85
103
|
export declare function Scoped(ctor: any): void;
|
|
86
104
|
/** Class decorator identifying the required scope for a service as 'singleton'. */
|
|
@@ -108,33 +126,36 @@ export declare class SingletonServiceFactory<T> implements IServiceFactory<T> {
|
|
|
108
126
|
}
|
|
109
127
|
export declare class ServiceMap implements IServiceRegistration, IServiceCollection, IOptionsService, IInstantiationService {
|
|
110
128
|
private readonly services;
|
|
129
|
+
private readonly instances;
|
|
111
130
|
private isFrozen?;
|
|
112
|
-
|
|
131
|
+
/** Creates a new ServiceMap instance; note: the services parameter is for internal purposes and should not be used. */
|
|
132
|
+
constructor(services?: Map<string, IServiceEntry<any>>);
|
|
113
133
|
addOptionsProvider(provider: IOptionsProvider): void;
|
|
114
134
|
configureOptions<T>(options: IOptions<T>, callback: (options: T) => T): void;
|
|
115
135
|
createInstance<T>(ctor: Constructor<T>): T;
|
|
116
136
|
createScope(): IScopedServiceCollection;
|
|
117
137
|
getOptions<T>(options: IOptions<T>): T;
|
|
118
|
-
register<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance
|
|
119
|
-
registerInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance): void;
|
|
120
|
-
registerScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
121
|
-
registerSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
122
|
-
registerTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
123
|
-
tryRegister<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance
|
|
124
|
-
tryRegisterInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance): boolean;
|
|
125
|
-
tryRegisterScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
126
|
-
tryRegisterSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
127
|
-
tryRegisterTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance
|
|
138
|
+
register<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
139
|
+
registerInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance, options?: IServiceRegistrationOptions): void;
|
|
140
|
+
registerScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
141
|
+
registerSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
142
|
+
registerTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
143
|
+
tryRegister<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
144
|
+
tryRegisterInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance, options?: IServiceRegistrationOptions): boolean;
|
|
145
|
+
tryRegisterScoped<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
146
|
+
tryRegisterSingleton<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
147
|
+
tryRegisterTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
128
148
|
get<T>(serviceOrKey: IService<T> | string): T;
|
|
129
149
|
has<T>(serviceOrKey: IService<T> | string): boolean;
|
|
130
150
|
tryGet<T>(serviceOrKey: IService<T> | string): T | undefined;
|
|
131
151
|
/** Prevents items from being registered with the serivce map. */
|
|
132
152
|
freeze(): void;
|
|
153
|
+
protected getOrCreateServiceInstance(key: string, rootScope?: ServiceScope, ancestors?: Constructor<any>[]): any;
|
|
133
154
|
private registerService;
|
|
134
|
-
private
|
|
155
|
+
private tryRegisterService;
|
|
135
156
|
private checkFactoryInstance;
|
|
136
157
|
private checkInstanceScope;
|
|
137
|
-
private
|
|
158
|
+
private checkParentChildScopes;
|
|
138
159
|
private getOrCreateInjectable;
|
|
139
160
|
private createServiceInstance;
|
|
140
161
|
private createObjectInstance;
|
|
@@ -121,13 +121,18 @@ class SingletonServiceFactory {
|
|
|
121
121
|
}
|
|
122
122
|
exports.SingletonServiceFactory = SingletonServiceFactory;
|
|
123
123
|
class ServiceMap {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
this
|
|
129
|
-
|
|
130
|
-
|
|
124
|
+
/** Creates a new ServiceMap instance; note: the services parameter is for internal purposes and should not be used. */
|
|
125
|
+
constructor(services = new Map()) {
|
|
126
|
+
this.services = services;
|
|
127
|
+
this.instances = new Map();
|
|
128
|
+
// assume this is a scoped service if the provided map already has entries
|
|
129
|
+
if (!services.size) {
|
|
130
|
+
// the thisFactory is used to return the appropriate ServiceMap instance since the IInstantiationService and IServiceCollection services need to be scoped
|
|
131
|
+
const thisFactory = { create: service => service };
|
|
132
|
+
this.registerService(exports.IInstantiationService, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
133
|
+
this.registerService(exports.IServiceCollection, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
134
|
+
this.registerSingleton(exports.IOptionsService, OptionsService, { sealed: true });
|
|
135
|
+
}
|
|
131
136
|
}
|
|
132
137
|
addOptionsProvider(provider) {
|
|
133
138
|
return this.get(exports.IOptionsService).addOptionsProvider(provider);
|
|
@@ -140,97 +145,76 @@ class ServiceMap {
|
|
|
140
145
|
}
|
|
141
146
|
createScope() {
|
|
142
147
|
const parent = this;
|
|
148
|
+
const getOrCreateServiceInstanceFromParent = this.getOrCreateServiceInstance.bind(this);
|
|
143
149
|
return new class extends ServiceMap {
|
|
144
150
|
constructor() {
|
|
145
|
-
super();
|
|
146
|
-
// The service map registers a few built-in services that need to be handled a little differently
|
|
147
|
-
// -- if the service is singleton/instance it gets copied from the parent
|
|
148
|
-
// -- if the service is scoped/transient do not overwrite the entry from the parent
|
|
149
|
-
for (const entry of parent.services.values()) {
|
|
150
|
-
if (entry.scope === "singleton" /* singleton */ || entry.scope === "instance" /* instance */) {
|
|
151
|
-
// copy the singleton entry directly to the scoped collection - it's possible the instance has not yet been created so the entire entry gets copied down
|
|
152
|
-
this.registerEntry(entry);
|
|
153
|
-
}
|
|
154
|
-
else if (!this.services.has(entry.service.key)) {
|
|
155
|
-
// create a new entry for scoped/transient services
|
|
156
|
-
this.registerEntry({ ...entry, instance: undefined });
|
|
157
|
-
}
|
|
158
|
-
}
|
|
151
|
+
super(parent.services);
|
|
159
152
|
this.freeze();
|
|
160
153
|
}
|
|
161
154
|
dispose() {
|
|
162
|
-
for (const
|
|
163
|
-
//
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
service.instance.dispose();
|
|
155
|
+
for (const instance of this.instances.values()) {
|
|
156
|
+
// dispose instances created and referenced by the scope; this will be scoped and transient instances
|
|
157
|
+
// also make sure we don't dispose the current instance as that will cause a stack overflow
|
|
158
|
+
if (instance !== this && isDisposable(instance)) {
|
|
159
|
+
instance.dispose();
|
|
168
160
|
}
|
|
169
161
|
}
|
|
170
|
-
this.
|
|
162
|
+
this.instances.clear();
|
|
163
|
+
}
|
|
164
|
+
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
165
|
+
const entry = this.services.get(key);
|
|
166
|
+
if (entry !== undefined && (entry.scope === "singleton" /* singleton */ || entry.scope === "instance" /* instance */)) {
|
|
167
|
+
// if the service is an instance or singleton call up the parent chain and get the instance from the root
|
|
168
|
+
return getOrCreateServiceInstanceFromParent(key, rootScope, ancestors);
|
|
169
|
+
}
|
|
170
|
+
return super.getOrCreateServiceInstance(key, rootScope, ancestors);
|
|
171
171
|
}
|
|
172
172
|
};
|
|
173
173
|
}
|
|
174
174
|
getOptions(options) {
|
|
175
175
|
return this.get(exports.IOptionsService).getOptions(options);
|
|
176
176
|
}
|
|
177
|
-
register(service, ctor) {
|
|
178
|
-
this.registerService(service, getServiceScope(ctor), ctor);
|
|
177
|
+
register(service, ctor, options) {
|
|
178
|
+
this.registerService(service, getServiceScope(ctor), ctor, options);
|
|
179
179
|
}
|
|
180
|
-
registerInstance(service, instance) {
|
|
180
|
+
registerInstance(service, instance, options) {
|
|
181
181
|
if (instance === undefined) {
|
|
182
182
|
throw new Error("instance undefined");
|
|
183
183
|
}
|
|
184
184
|
// TODO: check if the instance constructor has a required scope - if so, verify its a singleton
|
|
185
|
-
this.
|
|
186
|
-
|
|
187
|
-
scope: "instance" /* instance */,
|
|
188
|
-
instance
|
|
189
|
-
});
|
|
185
|
+
this.instances.set(service.key, instance);
|
|
186
|
+
this.services.set(service.key, { service, scope: "instance" /* instance */, sealed: options && options.sealed });
|
|
190
187
|
}
|
|
191
|
-
registerScoped(service, ctorOrFactory) {
|
|
192
|
-
this.registerService(service, "scoped" /* scoped */, ctorOrFactory);
|
|
188
|
+
registerScoped(service, ctorOrFactory, options) {
|
|
189
|
+
this.registerService(service, "scoped" /* scoped */, ctorOrFactory, options);
|
|
193
190
|
}
|
|
194
|
-
registerSingleton(service, ctorOrFactory) {
|
|
195
|
-
this.registerService(service, "singleton" /* singleton */, ctorOrFactory);
|
|
191
|
+
registerSingleton(service, ctorOrFactory, options) {
|
|
192
|
+
this.registerService(service, "singleton" /* singleton */, ctorOrFactory, options);
|
|
196
193
|
}
|
|
197
|
-
registerTransient(service, ctorOrFactory) {
|
|
198
|
-
this.registerService(service, "transient" /* transient */, ctorOrFactory);
|
|
194
|
+
registerTransient(service, ctorOrFactory, options) {
|
|
195
|
+
this.registerService(service, "transient" /* transient */, ctorOrFactory, options);
|
|
199
196
|
}
|
|
200
|
-
tryRegister(service, ctor) {
|
|
201
|
-
|
|
202
|
-
this.register(service, ctor);
|
|
203
|
-
return true;
|
|
204
|
-
}
|
|
205
|
-
return false;
|
|
197
|
+
tryRegister(service, ctor, options) {
|
|
198
|
+
return this.tryRegisterService(service, getServiceScope(ctor), ctor, options) === "success";
|
|
206
199
|
}
|
|
207
|
-
tryRegisterInstance(service, instance) {
|
|
208
|
-
|
|
209
|
-
|
|
200
|
+
tryRegisterInstance(service, instance, options) {
|
|
201
|
+
try {
|
|
202
|
+
// TODO: refactor -- need to invoke registerInstance because it registers the instance
|
|
203
|
+
this.registerInstance(service, instance, options);
|
|
210
204
|
return true;
|
|
211
205
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
tryRegisterScoped(service, ctorOrFactory) {
|
|
215
|
-
if (!this.services.has(service.key)) {
|
|
216
|
-
this.registerScoped(service, ctorOrFactory);
|
|
217
|
-
return true;
|
|
206
|
+
catch {
|
|
207
|
+
return false;
|
|
218
208
|
}
|
|
219
|
-
return false;
|
|
220
209
|
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
this.registerSingleton(service, ctorOrFactory);
|
|
224
|
-
return true;
|
|
225
|
-
}
|
|
226
|
-
return false;
|
|
210
|
+
tryRegisterScoped(service, ctorOrFactory, options) {
|
|
211
|
+
return this.tryRegisterService(service, "scoped" /* scoped */, ctorOrFactory, options) === "success";
|
|
227
212
|
}
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
return false;
|
|
213
|
+
tryRegisterSingleton(service, ctorOrFactory, options) {
|
|
214
|
+
return this.tryRegisterService(service, "singleton" /* singleton */, ctorOrFactory, options) === "success";
|
|
215
|
+
}
|
|
216
|
+
tryRegisterTransient(service, ctorOrFactory, options) {
|
|
217
|
+
return this.tryRegisterService(service, "transient" /* transient */, ctorOrFactory, options) === "success";
|
|
234
218
|
}
|
|
235
219
|
get(serviceOrKey) {
|
|
236
220
|
const key = typeof serviceOrKey === "string" ? serviceOrKey : serviceOrKey.key;
|
|
@@ -250,22 +234,46 @@ class ServiceMap {
|
|
|
250
234
|
freeze() {
|
|
251
235
|
this.isFrozen = true;
|
|
252
236
|
}
|
|
253
|
-
|
|
254
|
-
this.
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
237
|
+
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
238
|
+
const entry = this.services.get(key);
|
|
239
|
+
if (!entry) {
|
|
240
|
+
throw new Error(`Service not registered for key '${key}'.`);
|
|
241
|
+
}
|
|
242
|
+
let current = this.instances.get(key);
|
|
243
|
+
if (current) {
|
|
244
|
+
return current;
|
|
245
|
+
}
|
|
246
|
+
const instance = this.createServiceInstance(entry, rootScope, ancestors);
|
|
247
|
+
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
248
|
+
this.instances.set(key, instance);
|
|
249
|
+
}
|
|
250
|
+
return instance;
|
|
260
251
|
}
|
|
261
|
-
|
|
262
|
-
|
|
252
|
+
registerService(service, scope, ctorOrFactory, options) {
|
|
253
|
+
const result = this.tryRegisterService(service, scope, ctorOrFactory, options);
|
|
254
|
+
if (result === "frozen") {
|
|
263
255
|
throw new Error("Service collection is frozen");
|
|
264
256
|
}
|
|
265
|
-
if (
|
|
266
|
-
|
|
257
|
+
if (result === "sealed") {
|
|
258
|
+
throw new Error(`Service with key (${service.key}) cannot be overridden.`);
|
|
267
259
|
}
|
|
268
|
-
|
|
260
|
+
}
|
|
261
|
+
tryRegisterService(service, scope, ctorOrFactory, options) {
|
|
262
|
+
if (this.isFrozen === true) {
|
|
263
|
+
return "frozen";
|
|
264
|
+
}
|
|
265
|
+
const current = this.services.get(service.key);
|
|
266
|
+
if (current && current.sealed) {
|
|
267
|
+
return "sealed";
|
|
268
|
+
}
|
|
269
|
+
const ctor = isConstructor(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
270
|
+
const factory = isServiceFactory(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
271
|
+
const sealed = options && options.sealed;
|
|
272
|
+
if (ctor) {
|
|
273
|
+
this.checkInstanceScope(ctor, scope);
|
|
274
|
+
}
|
|
275
|
+
this.services.set(service.key, { service, scope, ctor, factory, sealed });
|
|
276
|
+
return "success";
|
|
269
277
|
}
|
|
270
278
|
checkFactoryInstance(instance, scope) {
|
|
271
279
|
if (typeof instance !== "object" && typeof instance !== "function") {
|
|
@@ -281,30 +289,23 @@ class ServiceMap {
|
|
|
281
289
|
throw new Error("Registered service scope is different than the instance required scope");
|
|
282
290
|
}
|
|
283
291
|
}
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
if (entry.instance) {
|
|
290
|
-
return entry.instance;
|
|
291
|
-
}
|
|
292
|
-
const instance = this.createServiceInstance(entry, ancestors);
|
|
293
|
-
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
294
|
-
entry.instance = instance;
|
|
292
|
+
checkParentChildScopes(parentScope, childScope) {
|
|
293
|
+
if (!parentScope || parentScope === "instance" /* instance */ || parentScope === "singleton" /* singleton */) {
|
|
294
|
+
if (childScope === "scoped" /* scoped */) {
|
|
295
|
+
throw new Error("Scoped services should only be referenced by Transient or other Scoped services.");
|
|
296
|
+
}
|
|
295
297
|
}
|
|
296
|
-
return instance;
|
|
297
298
|
}
|
|
298
|
-
getOrCreateInjectable(injectable, ancestors) {
|
|
299
|
+
getOrCreateInjectable(injectable, rootScope, ancestors) {
|
|
299
300
|
if (this.services.has(injectable.key)) {
|
|
300
|
-
return this.getOrCreateServiceInstance(injectable.key, ancestors);
|
|
301
|
+
return this.getOrCreateServiceInstance(injectable.key, rootScope, ancestors);
|
|
301
302
|
}
|
|
302
303
|
if (injectable.factory) {
|
|
303
304
|
return injectable.factory(this);
|
|
304
305
|
}
|
|
305
306
|
throw new Error(`Invalid injectable (${injectable.key}), either a service has not been registered or the injectable does not define a factory.`);
|
|
306
307
|
}
|
|
307
|
-
createServiceInstance(entry, ancestors) {
|
|
308
|
+
createServiceInstance(entry, rootScope, ancestors) {
|
|
308
309
|
if (entry.factory) {
|
|
309
310
|
const instance = entry.factory.create(this);
|
|
310
311
|
// even though the scope cannot be verified until now it is still a good idea to check that the service instance is being properly scoped
|
|
@@ -312,11 +313,11 @@ class ServiceMap {
|
|
|
312
313
|
return instance;
|
|
313
314
|
}
|
|
314
315
|
if (entry.ctor) {
|
|
315
|
-
return this.createObjectInstance(entry.ctor, ancestors);
|
|
316
|
+
return this.createObjectInstance(entry.ctor, rootScope, ancestors);
|
|
316
317
|
}
|
|
317
318
|
throw new Error("Invalid service entry.");
|
|
318
319
|
}
|
|
319
|
-
createObjectInstance(ctor, ancestors) {
|
|
320
|
+
createObjectInstance(ctor, rootScope, ancestors) {
|
|
320
321
|
if (ancestors && ancestors.includes(ctor)) {
|
|
321
322
|
const path = [...ancestors.map(ctor => ctor.name), ctor.name].join(" -> ");
|
|
322
323
|
throw new Error("Circular dependency detected: " + path);
|
|
@@ -327,10 +328,18 @@ class ServiceMap {
|
|
|
327
328
|
throw new Error(`Invalid constructor (${ctor.name}), all parameters must be injectable.`);
|
|
328
329
|
}
|
|
329
330
|
try {
|
|
331
|
+
// root scope is used to ensure service dependecies are properly scoped -- mainly, singleton services should not reference scoped services
|
|
332
|
+
rootScope = rootScope || ctor[scope];
|
|
333
|
+
// ancestors is used to track circular dependencies
|
|
330
334
|
ancestors = ancestors || [];
|
|
331
335
|
ancestors.push(ctor);
|
|
332
336
|
// create/get instances for all the object's constructor parameters
|
|
333
|
-
const args = keys.map(key =>
|
|
337
|
+
const args = keys.map(key => {
|
|
338
|
+
const injectable = dependencies[key];
|
|
339
|
+
const entry = this.services.get(injectable.key);
|
|
340
|
+
this.checkParentChildScopes(rootScope, entry && entry.scope);
|
|
341
|
+
return this.getOrCreateInjectable(injectable, rootScope, ancestors);
|
|
342
|
+
});
|
|
334
343
|
ancestors.splice(ancestors.indexOf(ctor), 1);
|
|
335
344
|
return new ctor(...args);
|
|
336
345
|
}
|
|
@@ -392,4 +401,4 @@ class OptionsService {
|
|
|
392
401
|
return options;
|
|
393
402
|
}
|
|
394
403
|
}
|
|
395
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../src/service-collection.ts"],"names":[],"mappings":"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"}
|
|
404
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../src/service-collection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shrub/core",
|
|
3
3
|
"description": "A framework for modular server-side applications and front-end components.",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.30",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -22,5 +22,5 @@
|
|
|
22
22
|
"clean": "rimraf ./dist && rimraf tsconfig.tsbuildinfo",
|
|
23
23
|
"test": "jest"
|
|
24
24
|
},
|
|
25
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "b146deb7bac0f9bc51c28a610a1f3062ade6ba69"
|
|
26
26
|
}
|