@shrub/core 0.5.76 → 0.5.78
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/module.js +5 -6
- package/dist/esm/service-collection.js +47 -33
- package/dist/index.js +6 -2
- package/dist/module.d.ts +6 -6
- package/dist/module.js +5 -6
- package/dist/service-collection.d.ts +13 -9
- package/dist/service-collection.js +47 -33
- package/package.json +2 -2
package/dist/esm/module.js
CHANGED
|
@@ -11,11 +11,10 @@ export class ModuleLoadError extends Error {
|
|
|
11
11
|
}
|
|
12
12
|
/** Handles initializing and loading modules. */
|
|
13
13
|
export class ModuleLoader {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
14
|
+
services = new ServiceMap();
|
|
15
|
+
modules = [];
|
|
16
|
+
settings = {};
|
|
17
|
+
isLoaded;
|
|
19
18
|
static load(modulesOrOptions) {
|
|
20
19
|
const options = Array.isArray(modulesOrOptions) ? { modules: modulesOrOptions } : modulesOrOptions;
|
|
21
20
|
const loader = new ModuleLoader();
|
|
@@ -247,4 +246,4 @@ export class ModuleLoader {
|
|
|
247
246
|
return typeof obj === "object" && obj.name !== undefined;
|
|
248
247
|
}
|
|
249
248
|
}
|
|
250
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,15 +5,15 @@ const dependencies = "__dependencies";
|
|
|
5
5
|
const scope = "__scope";
|
|
6
6
|
/** Class decorator identifying the required scope for a service as 'scoped'. */
|
|
7
7
|
export function Scoped(ctor) {
|
|
8
|
-
ctor[scope] = "scoped" /* scoped */;
|
|
8
|
+
ctor[scope] = "scoped" /* ServiceScope.scoped */;
|
|
9
9
|
}
|
|
10
10
|
/** Class decorator identifying the required scope for a service as 'singleton'. */
|
|
11
11
|
export function Singleton(ctor) {
|
|
12
|
-
ctor[scope] = "singleton" /* singleton */;
|
|
12
|
+
ctor[scope] = "singleton" /* ServiceScope.singleton */;
|
|
13
13
|
}
|
|
14
14
|
/** Class decorator identifying the required scope for a service as 'transient'. */
|
|
15
15
|
export function Transient(ctor) {
|
|
16
|
-
ctor[scope] = "transient" /* transient */;
|
|
16
|
+
ctor[scope] = "transient" /* ServiceScope.transient */;
|
|
17
17
|
}
|
|
18
18
|
export function createInjectable(keyOrOptions) {
|
|
19
19
|
const options = typeof keyOrOptions === "object" ? keyOrOptions : { key: keyOrOptions };
|
|
@@ -49,7 +49,7 @@ export function createOptions(key, defaultOptions) {
|
|
|
49
49
|
options.register((obj, invalid) => {
|
|
50
50
|
for (const prop of props) {
|
|
51
51
|
if (obj[prop] === undefined) {
|
|
52
|
-
invalid(new OptionsValidationError(`Options (${key}) property (${prop}) is required.`));
|
|
52
|
+
invalid(new OptionsValidationError(`Options (${key}) property (${String(prop)}) is required.`));
|
|
53
53
|
break;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -98,6 +98,7 @@ function isServiceFactory(target) {
|
|
|
98
98
|
}
|
|
99
99
|
/** Represents an error that has occurred while trying to create an object instance. */
|
|
100
100
|
export class ObjectCreateError extends Error {
|
|
101
|
+
inner;
|
|
101
102
|
constructor(message, inner) {
|
|
102
103
|
super(message);
|
|
103
104
|
this.inner = inner;
|
|
@@ -109,6 +110,8 @@ export class ObjectCreateError extends Error {
|
|
|
109
110
|
* This is useful for singleton services that implement multiple service interfaces.
|
|
110
111
|
*/
|
|
111
112
|
export class SingletonServiceFactory {
|
|
113
|
+
ctorOrFactory;
|
|
114
|
+
instance;
|
|
112
115
|
constructor(ctorOrFactory) {
|
|
113
116
|
this.ctorOrFactory = ctorOrFactory;
|
|
114
117
|
}
|
|
@@ -122,16 +125,19 @@ export class SingletonServiceFactory {
|
|
|
122
125
|
}
|
|
123
126
|
}
|
|
124
127
|
export class ServiceMap {
|
|
125
|
-
|
|
126
|
-
|
|
128
|
+
services;
|
|
129
|
+
isScoped;
|
|
130
|
+
instances = new Map();
|
|
131
|
+
isFrozen;
|
|
132
|
+
/** Creates a new ServiceMap instance; note: the parameters are for internal purposes and should not be used. */
|
|
133
|
+
constructor(services = new Map(), isScoped = false) {
|
|
127
134
|
this.services = services;
|
|
128
|
-
this.
|
|
129
|
-
|
|
130
|
-
if (!services.size) {
|
|
135
|
+
this.isScoped = isScoped;
|
|
136
|
+
if (!isScoped) {
|
|
131
137
|
// the thisFactory is used to return the appropriate ServiceMap instance since the IInstantiationService and IServiceCollection services need to be scoped
|
|
132
138
|
const thisFactory = { create: service => service };
|
|
133
|
-
this.registerService(IInstantiationService, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
134
|
-
this.registerService(IServiceCollection, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
139
|
+
this.registerService(IInstantiationService, "scoped" /* ServiceScope.scoped */, thisFactory, { sealed: true });
|
|
140
|
+
this.registerService(IServiceCollection, "scoped" /* ServiceScope.scoped */, thisFactory, { sealed: true });
|
|
135
141
|
this.registerSingleton(IOptionsService, OptionsService, { sealed: true });
|
|
136
142
|
}
|
|
137
143
|
}
|
|
@@ -146,12 +152,16 @@ export class ServiceMap {
|
|
|
146
152
|
? this.createInjectableInstance(ctorOrInjectable)
|
|
147
153
|
: this.createObjectInstance(ctorOrInjectable);
|
|
148
154
|
}
|
|
149
|
-
createScope() {
|
|
155
|
+
createScope(register) {
|
|
150
156
|
const parent = this;
|
|
151
157
|
const getOrCreateServiceInstanceFromParent = this.getOrCreateServiceInstance.bind(this);
|
|
152
158
|
return new class extends ServiceMap {
|
|
153
159
|
constructor() {
|
|
154
|
-
|
|
160
|
+
// if registering new services we need to copy the current entries into a new map; otherwise, pass a reference to the parent's set of services
|
|
161
|
+
super(register ? new Map(parent.services) : parent.services, /* isScoped */ true);
|
|
162
|
+
if (register) {
|
|
163
|
+
register(this);
|
|
164
|
+
}
|
|
155
165
|
this.freeze();
|
|
156
166
|
}
|
|
157
167
|
dispose() {
|
|
@@ -165,10 +175,13 @@ export class ServiceMap {
|
|
|
165
175
|
this.instances.clear();
|
|
166
176
|
}
|
|
167
177
|
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
168
|
-
|
|
169
|
-
if (
|
|
170
|
-
|
|
171
|
-
|
|
178
|
+
// if the service is registered direclty with the scoped service collection the parent collection will not be aware so check that first
|
|
179
|
+
if (parent.has(key)) {
|
|
180
|
+
const entry = this.services.get(key);
|
|
181
|
+
if (entry !== undefined && entry.scope !== "scoped" /* ServiceScope.scoped */) {
|
|
182
|
+
// if the service is non-scoped call up the parent chain and get the instance from the root
|
|
183
|
+
return getOrCreateServiceInstanceFromParent(key, rootScope, ancestors);
|
|
184
|
+
}
|
|
172
185
|
}
|
|
173
186
|
return super.getOrCreateServiceInstance(key, rootScope, ancestors);
|
|
174
187
|
}
|
|
@@ -184,18 +197,21 @@ export class ServiceMap {
|
|
|
184
197
|
if (instance === undefined) {
|
|
185
198
|
throw new Error("instance undefined");
|
|
186
199
|
}
|
|
200
|
+
if (this.isScoped && this.services.has(service.key)) {
|
|
201
|
+
throw new Error(`Service with key (${service.key}) cannot be overridden.`);
|
|
202
|
+
}
|
|
187
203
|
// TODO: check if the instance constructor has a required scope - if so, verify its a singleton
|
|
188
204
|
this.instances.set(service.key, instance);
|
|
189
|
-
this.services.set(service.key, { service, scope: "instance" /* instance */, sealed: options && options.sealed });
|
|
205
|
+
this.services.set(service.key, { service, scope: "instance" /* ServiceScope.instance */, sealed: options && options.sealed });
|
|
190
206
|
}
|
|
191
207
|
registerScoped(service, ctorOrFactory, options) {
|
|
192
|
-
this.registerService(service, "scoped" /* scoped */, ctorOrFactory, options);
|
|
208
|
+
this.registerService(service, "scoped" /* ServiceScope.scoped */, ctorOrFactory, options);
|
|
193
209
|
}
|
|
194
210
|
registerSingleton(service, ctorOrFactory, options) {
|
|
195
|
-
this.registerService(service, "singleton" /* singleton */, ctorOrFactory, options);
|
|
211
|
+
this.registerService(service, "singleton" /* ServiceScope.singleton */, ctorOrFactory, options);
|
|
196
212
|
}
|
|
197
213
|
registerTransient(service, ctorOrFactory, options) {
|
|
198
|
-
this.registerService(service, "transient" /* transient */, ctorOrFactory, options);
|
|
214
|
+
this.registerService(service, "transient" /* ServiceScope.transient */, ctorOrFactory, options);
|
|
199
215
|
}
|
|
200
216
|
tryRegister(service, ctor, options) {
|
|
201
217
|
return this.tryRegisterService(service, getServiceScope(ctor), ctor, options) === "success";
|
|
@@ -211,13 +227,13 @@ export class ServiceMap {
|
|
|
211
227
|
}
|
|
212
228
|
}
|
|
213
229
|
tryRegisterScoped(service, ctorOrFactory, options) {
|
|
214
|
-
return this.tryRegisterService(service, "scoped" /* scoped */, ctorOrFactory, options) === "success";
|
|
230
|
+
return this.tryRegisterService(service, "scoped" /* ServiceScope.scoped */, ctorOrFactory, options) === "success";
|
|
215
231
|
}
|
|
216
232
|
tryRegisterSingleton(service, ctorOrFactory, options) {
|
|
217
|
-
return this.tryRegisterService(service, "singleton" /* singleton */, ctorOrFactory, options) === "success";
|
|
233
|
+
return this.tryRegisterService(service, "singleton" /* ServiceScope.singleton */, ctorOrFactory, options) === "success";
|
|
218
234
|
}
|
|
219
235
|
tryRegisterTransient(service, ctorOrFactory, options) {
|
|
220
|
-
return this.tryRegisterService(service, "transient" /* transient */, ctorOrFactory, options) === "success";
|
|
236
|
+
return this.tryRegisterService(service, "transient" /* ServiceScope.transient */, ctorOrFactory, options) === "success";
|
|
221
237
|
}
|
|
222
238
|
get(serviceOrKey) {
|
|
223
239
|
const key = typeof serviceOrKey === "string" ? serviceOrKey : serviceOrKey.key;
|
|
@@ -247,7 +263,7 @@ export class ServiceMap {
|
|
|
247
263
|
return current;
|
|
248
264
|
}
|
|
249
265
|
const instance = this.createServiceInstance(entry, rootScope, ancestors);
|
|
250
|
-
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
266
|
+
if (entry.scope === "scoped" /* ServiceScope.scoped */ || entry.scope === "singleton" /* ServiceScope.singleton */) {
|
|
251
267
|
this.instances.set(key, instance);
|
|
252
268
|
}
|
|
253
269
|
return instance;
|
|
@@ -266,7 +282,7 @@ export class ServiceMap {
|
|
|
266
282
|
return "frozen";
|
|
267
283
|
}
|
|
268
284
|
const current = this.services.get(service.key);
|
|
269
|
-
if (current && current.sealed) {
|
|
285
|
+
if (current && (current.sealed || this.isScoped)) {
|
|
270
286
|
return "sealed";
|
|
271
287
|
}
|
|
272
288
|
const ctor = isConstructor(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
@@ -293,8 +309,8 @@ export class ServiceMap {
|
|
|
293
309
|
}
|
|
294
310
|
}
|
|
295
311
|
checkParentChildScopes(parentScope, childScope) {
|
|
296
|
-
if (!parentScope || parentScope === "instance" /* instance */ || parentScope === "singleton" /* singleton */) {
|
|
297
|
-
if (childScope === "scoped" /* scoped */) {
|
|
312
|
+
if (!parentScope || parentScope === "instance" /* ServiceScope.instance */ || parentScope === "singleton" /* ServiceScope.singleton */) {
|
|
313
|
+
if (childScope === "scoped" /* ServiceScope.scoped */) {
|
|
298
314
|
throw new Error("Scoped services should only be referenced by Transient or other Scoped services.");
|
|
299
315
|
}
|
|
300
316
|
}
|
|
@@ -367,10 +383,8 @@ export class OptionsValidationError extends Error {
|
|
|
367
383
|
}
|
|
368
384
|
}
|
|
369
385
|
class OptionsService {
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
this.providers = [];
|
|
373
|
-
}
|
|
386
|
+
options = new Map();
|
|
387
|
+
providers = [];
|
|
374
388
|
addOptionsProvider(provider) {
|
|
375
389
|
this.providers.unshift(provider);
|
|
376
390
|
}
|
|
@@ -410,4 +424,4 @@ class OptionsService {
|
|
|
410
424
|
return options;
|
|
411
425
|
}
|
|
412
426
|
}
|
|
413
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../../src/service-collection.ts"],"names":[],"mappings":"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"}
|
|
427
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../../src/service-collection.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -12,4 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./module"), exports);
|
|
14
18
|
__exportStar(require("./service-collection"), exports);
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUF5QjtBQUN6Qix1REFBcUMifQ==
|
package/dist/module.d.ts
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { IOptions, IServiceCollection, IServiceRegistration } from "./service-collection";
|
|
2
|
-
export
|
|
2
|
+
export type ModuleConstructor<T extends IModule = IModule> = {
|
|
3
3
|
new (): T;
|
|
4
4
|
};
|
|
5
|
-
export
|
|
6
|
-
export
|
|
7
|
-
export
|
|
5
|
+
export type ModuleInstanceOrConstructor = IModule | ModuleConstructor;
|
|
6
|
+
export type ModuleDependency = ModuleInstanceOrConstructor | (() => Promise<ModuleInstanceOrConstructor>);
|
|
7
|
+
export type SettingsInitializer = {
|
|
8
8
|
/**
|
|
9
9
|
* Binds module settings to an options object; the options object gets bound to the settings path {module-name} or {module-name}/{section-name}.
|
|
10
10
|
* The section name parameter is optional and useful for binding to a section of the module's settings.
|
|
11
11
|
*/
|
|
12
12
|
readonly bindToOptions: <T>(options: IOptions<T>, sectionName?: string) => void;
|
|
13
13
|
};
|
|
14
|
-
|
|
14
|
+
type ConfigurationInitializer<T> = {
|
|
15
15
|
readonly register: (callback: (configurator: IModuleConfigurator) => T) => void;
|
|
16
16
|
};
|
|
17
|
-
|
|
17
|
+
type OptionsProvider = {
|
|
18
18
|
/**
|
|
19
19
|
* A helper function for getting an option instance from the current module settings.
|
|
20
20
|
* It's expected that the module also use bindToOptions to bind to the module's settings.
|
package/dist/module.js
CHANGED
|
@@ -16,11 +16,10 @@ class ModuleLoadError extends Error {
|
|
|
16
16
|
exports.ModuleLoadError = ModuleLoadError;
|
|
17
17
|
/** Handles initializing and loading modules. */
|
|
18
18
|
class ModuleLoader {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
19
|
+
services = new service_collection_1.ServiceMap();
|
|
20
|
+
modules = [];
|
|
21
|
+
settings = {};
|
|
22
|
+
isLoaded;
|
|
24
23
|
static load(modulesOrOptions) {
|
|
25
24
|
const options = Array.isArray(modulesOrOptions) ? { modules: modulesOrOptions } : modulesOrOptions;
|
|
26
25
|
const loader = new ModuleLoader();
|
|
@@ -253,4 +252,4 @@ class ModuleLoader {
|
|
|
253
252
|
}
|
|
254
253
|
}
|
|
255
254
|
exports.ModuleLoader = ModuleLoader;
|
|
256
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
255
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
|
|
1
|
+
export type ValidateOptionsCallback<T> = (obj: T, invalid: (err: OptionsValidationError) => void) => void;
|
|
2
|
+
export type ValidateOptionsFailCallback = (err: OptionsValidationError) => void;
|
|
3
|
+
type Constructor<T> = {
|
|
4
4
|
new (...args: any[]): T;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type NonOptionalKeys<T> = {
|
|
7
7
|
[K in keyof T]-?: undefined extends T[K] ? never : K;
|
|
8
8
|
}[keyof T];
|
|
9
9
|
/** Defines an object that supports a dispose function; scoped service instances that implement dispose will get invoked when the scoped container is cleaned up. */
|
|
@@ -85,8 +85,11 @@ export interface IServiceRegistration {
|
|
|
85
85
|
tryRegisterTransient<T, TInstance extends T>(service: IService<T>, ctorOrFactory: Constructor<TInstance> | IServiceFactory<TInstance>, options?: IServiceRegistrationOptions): boolean;
|
|
86
86
|
}
|
|
87
87
|
export interface IServiceCollection {
|
|
88
|
-
/**
|
|
89
|
-
|
|
88
|
+
/**
|
|
89
|
+
* Creates a scoped collection and optionally allows registering services into the scoped service collection.
|
|
90
|
+
* Note: overwriting existing services are not allowed with scoped service collections.
|
|
91
|
+
*/
|
|
92
|
+
createScope(register?: (registration: IServiceRegistration) => void): IScopedServiceCollection;
|
|
90
93
|
/** Gets an instance of the registered service. */
|
|
91
94
|
get<T>(serviceOrKey: IService<T> | string): T;
|
|
92
95
|
/** True if a service has been registered. */
|
|
@@ -142,14 +145,15 @@ export declare class SingletonServiceFactory<T> implements IServiceFactory<T> {
|
|
|
142
145
|
}
|
|
143
146
|
export declare class ServiceMap implements IServiceRegistration, IServiceCollection, IOptionsService, IInstantiationService {
|
|
144
147
|
private readonly services;
|
|
148
|
+
readonly isScoped: boolean;
|
|
145
149
|
private readonly instances;
|
|
146
150
|
private isFrozen?;
|
|
147
|
-
/** Creates a new ServiceMap instance; note: the
|
|
148
|
-
constructor(services?: Map<string, IServiceEntry<any
|
|
151
|
+
/** Creates a new ServiceMap instance; note: the parameters are for internal purposes and should not be used. */
|
|
152
|
+
constructor(services?: Map<string, IServiceEntry<any>>, isScoped?: boolean);
|
|
149
153
|
addOptionsProvider(provider: IOptionsProvider): void;
|
|
150
154
|
configureOptions<T>(options: IOptions<T>, callback: (options: T) => T): void;
|
|
151
155
|
createInstance<T>(ctorOrInjectable: Constructor<T> | IInjectable<T>): T;
|
|
152
|
-
createScope(): IScopedServiceCollection;
|
|
156
|
+
createScope(register?: (registration: IServiceRegistration) => void): IScopedServiceCollection;
|
|
153
157
|
getOptions<T>(options: IOptions<T>): T;
|
|
154
158
|
register<T, TInstance extends T>(service: IService<T>, ctor: Constructor<TInstance>, options?: IServiceRegistrationOptions): void;
|
|
155
159
|
registerInstance<T, TInstance extends T>(service: IService<T>, instance: TInstance, options?: IServiceRegistrationOptions): void;
|
|
@@ -8,17 +8,17 @@ const dependencies = "__dependencies";
|
|
|
8
8
|
const scope = "__scope";
|
|
9
9
|
/** Class decorator identifying the required scope for a service as 'scoped'. */
|
|
10
10
|
function Scoped(ctor) {
|
|
11
|
-
ctor[scope] = "scoped" /* scoped */;
|
|
11
|
+
ctor[scope] = "scoped" /* ServiceScope.scoped */;
|
|
12
12
|
}
|
|
13
13
|
exports.Scoped = Scoped;
|
|
14
14
|
/** Class decorator identifying the required scope for a service as 'singleton'. */
|
|
15
15
|
function Singleton(ctor) {
|
|
16
|
-
ctor[scope] = "singleton" /* singleton */;
|
|
16
|
+
ctor[scope] = "singleton" /* ServiceScope.singleton */;
|
|
17
17
|
}
|
|
18
18
|
exports.Singleton = Singleton;
|
|
19
19
|
/** Class decorator identifying the required scope for a service as 'transient'. */
|
|
20
20
|
function Transient(ctor) {
|
|
21
|
-
ctor[scope] = "transient" /* transient */;
|
|
21
|
+
ctor[scope] = "transient" /* ServiceScope.transient */;
|
|
22
22
|
}
|
|
23
23
|
exports.Transient = Transient;
|
|
24
24
|
function createInjectable(keyOrOptions) {
|
|
@@ -56,7 +56,7 @@ function createOptions(key, defaultOptions) {
|
|
|
56
56
|
options.register((obj, invalid) => {
|
|
57
57
|
for (const prop of props) {
|
|
58
58
|
if (obj[prop] === undefined) {
|
|
59
|
-
invalid(new OptionsValidationError(`Options (${key}) property (${prop}) is required.`));
|
|
59
|
+
invalid(new OptionsValidationError(`Options (${key}) property (${String(prop)}) is required.`));
|
|
60
60
|
break;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -107,6 +107,7 @@ function isServiceFactory(target) {
|
|
|
107
107
|
}
|
|
108
108
|
/** Represents an error that has occurred while trying to create an object instance. */
|
|
109
109
|
class ObjectCreateError extends Error {
|
|
110
|
+
inner;
|
|
110
111
|
constructor(message, inner) {
|
|
111
112
|
super(message);
|
|
112
113
|
this.inner = inner;
|
|
@@ -119,6 +120,8 @@ exports.ObjectCreateError = ObjectCreateError;
|
|
|
119
120
|
* This is useful for singleton services that implement multiple service interfaces.
|
|
120
121
|
*/
|
|
121
122
|
class SingletonServiceFactory {
|
|
123
|
+
ctorOrFactory;
|
|
124
|
+
instance;
|
|
122
125
|
constructor(ctorOrFactory) {
|
|
123
126
|
this.ctorOrFactory = ctorOrFactory;
|
|
124
127
|
}
|
|
@@ -133,16 +136,19 @@ class SingletonServiceFactory {
|
|
|
133
136
|
}
|
|
134
137
|
exports.SingletonServiceFactory = SingletonServiceFactory;
|
|
135
138
|
class ServiceMap {
|
|
136
|
-
|
|
137
|
-
|
|
139
|
+
services;
|
|
140
|
+
isScoped;
|
|
141
|
+
instances = new Map();
|
|
142
|
+
isFrozen;
|
|
143
|
+
/** Creates a new ServiceMap instance; note: the parameters are for internal purposes and should not be used. */
|
|
144
|
+
constructor(services = new Map(), isScoped = false) {
|
|
138
145
|
this.services = services;
|
|
139
|
-
this.
|
|
140
|
-
|
|
141
|
-
if (!services.size) {
|
|
146
|
+
this.isScoped = isScoped;
|
|
147
|
+
if (!isScoped) {
|
|
142
148
|
// the thisFactory is used to return the appropriate ServiceMap instance since the IInstantiationService and IServiceCollection services need to be scoped
|
|
143
149
|
const thisFactory = { create: service => service };
|
|
144
|
-
this.registerService(exports.IInstantiationService, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
145
|
-
this.registerService(exports.IServiceCollection, "scoped" /* scoped */, thisFactory, { sealed: true });
|
|
150
|
+
this.registerService(exports.IInstantiationService, "scoped" /* ServiceScope.scoped */, thisFactory, { sealed: true });
|
|
151
|
+
this.registerService(exports.IServiceCollection, "scoped" /* ServiceScope.scoped */, thisFactory, { sealed: true });
|
|
146
152
|
this.registerSingleton(exports.IOptionsService, OptionsService, { sealed: true });
|
|
147
153
|
}
|
|
148
154
|
}
|
|
@@ -157,12 +163,16 @@ class ServiceMap {
|
|
|
157
163
|
? this.createInjectableInstance(ctorOrInjectable)
|
|
158
164
|
: this.createObjectInstance(ctorOrInjectable);
|
|
159
165
|
}
|
|
160
|
-
createScope() {
|
|
166
|
+
createScope(register) {
|
|
161
167
|
const parent = this;
|
|
162
168
|
const getOrCreateServiceInstanceFromParent = this.getOrCreateServiceInstance.bind(this);
|
|
163
169
|
return new class extends ServiceMap {
|
|
164
170
|
constructor() {
|
|
165
|
-
|
|
171
|
+
// if registering new services we need to copy the current entries into a new map; otherwise, pass a reference to the parent's set of services
|
|
172
|
+
super(register ? new Map(parent.services) : parent.services, /* isScoped */ true);
|
|
173
|
+
if (register) {
|
|
174
|
+
register(this);
|
|
175
|
+
}
|
|
166
176
|
this.freeze();
|
|
167
177
|
}
|
|
168
178
|
dispose() {
|
|
@@ -176,10 +186,13 @@ class ServiceMap {
|
|
|
176
186
|
this.instances.clear();
|
|
177
187
|
}
|
|
178
188
|
getOrCreateServiceInstance(key, rootScope, ancestors) {
|
|
179
|
-
|
|
180
|
-
if (
|
|
181
|
-
|
|
182
|
-
|
|
189
|
+
// if the service is registered direclty with the scoped service collection the parent collection will not be aware so check that first
|
|
190
|
+
if (parent.has(key)) {
|
|
191
|
+
const entry = this.services.get(key);
|
|
192
|
+
if (entry !== undefined && entry.scope !== "scoped" /* ServiceScope.scoped */) {
|
|
193
|
+
// if the service is non-scoped call up the parent chain and get the instance from the root
|
|
194
|
+
return getOrCreateServiceInstanceFromParent(key, rootScope, ancestors);
|
|
195
|
+
}
|
|
183
196
|
}
|
|
184
197
|
return super.getOrCreateServiceInstance(key, rootScope, ancestors);
|
|
185
198
|
}
|
|
@@ -195,18 +208,21 @@ class ServiceMap {
|
|
|
195
208
|
if (instance === undefined) {
|
|
196
209
|
throw new Error("instance undefined");
|
|
197
210
|
}
|
|
211
|
+
if (this.isScoped && this.services.has(service.key)) {
|
|
212
|
+
throw new Error(`Service with key (${service.key}) cannot be overridden.`);
|
|
213
|
+
}
|
|
198
214
|
// TODO: check if the instance constructor has a required scope - if so, verify its a singleton
|
|
199
215
|
this.instances.set(service.key, instance);
|
|
200
|
-
this.services.set(service.key, { service, scope: "instance" /* instance */, sealed: options && options.sealed });
|
|
216
|
+
this.services.set(service.key, { service, scope: "instance" /* ServiceScope.instance */, sealed: options && options.sealed });
|
|
201
217
|
}
|
|
202
218
|
registerScoped(service, ctorOrFactory, options) {
|
|
203
|
-
this.registerService(service, "scoped" /* scoped */, ctorOrFactory, options);
|
|
219
|
+
this.registerService(service, "scoped" /* ServiceScope.scoped */, ctorOrFactory, options);
|
|
204
220
|
}
|
|
205
221
|
registerSingleton(service, ctorOrFactory, options) {
|
|
206
|
-
this.registerService(service, "singleton" /* singleton */, ctorOrFactory, options);
|
|
222
|
+
this.registerService(service, "singleton" /* ServiceScope.singleton */, ctorOrFactory, options);
|
|
207
223
|
}
|
|
208
224
|
registerTransient(service, ctorOrFactory, options) {
|
|
209
|
-
this.registerService(service, "transient" /* transient */, ctorOrFactory, options);
|
|
225
|
+
this.registerService(service, "transient" /* ServiceScope.transient */, ctorOrFactory, options);
|
|
210
226
|
}
|
|
211
227
|
tryRegister(service, ctor, options) {
|
|
212
228
|
return this.tryRegisterService(service, getServiceScope(ctor), ctor, options) === "success";
|
|
@@ -222,13 +238,13 @@ class ServiceMap {
|
|
|
222
238
|
}
|
|
223
239
|
}
|
|
224
240
|
tryRegisterScoped(service, ctorOrFactory, options) {
|
|
225
|
-
return this.tryRegisterService(service, "scoped" /* scoped */, ctorOrFactory, options) === "success";
|
|
241
|
+
return this.tryRegisterService(service, "scoped" /* ServiceScope.scoped */, ctorOrFactory, options) === "success";
|
|
226
242
|
}
|
|
227
243
|
tryRegisterSingleton(service, ctorOrFactory, options) {
|
|
228
|
-
return this.tryRegisterService(service, "singleton" /* singleton */, ctorOrFactory, options) === "success";
|
|
244
|
+
return this.tryRegisterService(service, "singleton" /* ServiceScope.singleton */, ctorOrFactory, options) === "success";
|
|
229
245
|
}
|
|
230
246
|
tryRegisterTransient(service, ctorOrFactory, options) {
|
|
231
|
-
return this.tryRegisterService(service, "transient" /* transient */, ctorOrFactory, options) === "success";
|
|
247
|
+
return this.tryRegisterService(service, "transient" /* ServiceScope.transient */, ctorOrFactory, options) === "success";
|
|
232
248
|
}
|
|
233
249
|
get(serviceOrKey) {
|
|
234
250
|
const key = typeof serviceOrKey === "string" ? serviceOrKey : serviceOrKey.key;
|
|
@@ -258,7 +274,7 @@ class ServiceMap {
|
|
|
258
274
|
return current;
|
|
259
275
|
}
|
|
260
276
|
const instance = this.createServiceInstance(entry, rootScope, ancestors);
|
|
261
|
-
if (entry.scope === "scoped" /* scoped */ || entry.scope === "singleton" /* singleton */) {
|
|
277
|
+
if (entry.scope === "scoped" /* ServiceScope.scoped */ || entry.scope === "singleton" /* ServiceScope.singleton */) {
|
|
262
278
|
this.instances.set(key, instance);
|
|
263
279
|
}
|
|
264
280
|
return instance;
|
|
@@ -277,7 +293,7 @@ class ServiceMap {
|
|
|
277
293
|
return "frozen";
|
|
278
294
|
}
|
|
279
295
|
const current = this.services.get(service.key);
|
|
280
|
-
if (current && current.sealed) {
|
|
296
|
+
if (current && (current.sealed || this.isScoped)) {
|
|
281
297
|
return "sealed";
|
|
282
298
|
}
|
|
283
299
|
const ctor = isConstructor(ctorOrFactory) ? ctorOrFactory : undefined;
|
|
@@ -304,8 +320,8 @@ class ServiceMap {
|
|
|
304
320
|
}
|
|
305
321
|
}
|
|
306
322
|
checkParentChildScopes(parentScope, childScope) {
|
|
307
|
-
if (!parentScope || parentScope === "instance" /* instance */ || parentScope === "singleton" /* singleton */) {
|
|
308
|
-
if (childScope === "scoped" /* scoped */) {
|
|
323
|
+
if (!parentScope || parentScope === "instance" /* ServiceScope.instance */ || parentScope === "singleton" /* ServiceScope.singleton */) {
|
|
324
|
+
if (childScope === "scoped" /* ServiceScope.scoped */) {
|
|
309
325
|
throw new Error("Scoped services should only be referenced by Transient or other Scoped services.");
|
|
310
326
|
}
|
|
311
327
|
}
|
|
@@ -380,10 +396,8 @@ class OptionsValidationError extends Error {
|
|
|
380
396
|
}
|
|
381
397
|
exports.OptionsValidationError = OptionsValidationError;
|
|
382
398
|
class OptionsService {
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
this.providers = [];
|
|
386
|
-
}
|
|
399
|
+
options = new Map();
|
|
400
|
+
providers = [];
|
|
387
401
|
addOptionsProvider(provider) {
|
|
388
402
|
this.providers.unshift(provider);
|
|
389
403
|
}
|
|
@@ -423,4 +437,4 @@ class OptionsService {
|
|
|
423
437
|
return options;
|
|
424
438
|
}
|
|
425
439
|
}
|
|
426
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-collection.js","sourceRoot":"","sources":["../src/service-collection.ts"],"names":[],"mappings":"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"}
|
|
440
|
+
//# 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.78",
|
|
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": "51410600e8cf1b83f1ebf4b925739660a2d77bf8"
|
|
26
26
|
}
|