async-injection 1.2.4 → 1.3.0

package/lib/esm/class-provider.d.ts

@@ -2,12 +2,34 @@ import { BindableProvider } from './bindable-provider';
 import { ClassConstructor, InjectableId, Injector } from './injector';
 import { State } from './state';
 export declare type ResolveStateCallback = (id: InjectableId<any>) => State;
+/**
+ * @inheritDoc
+ * This specialization invokes it's configured class constructor synchronously and then scans for (and invokes) any @PostConstruct (which may be synchronous or asynchronous).
+ */
 export declare class ClassBasedProvider<T> extends BindableProvider<T, ClassConstructor<T>> {
     protected stateResolver: ResolveStateCallback;
     constructor(injector: Injector, id: InjectableId<T>, maker: ClassConstructor<T>, stateResolver: ResolveStateCallback);
+    /**
+     * @inheritDoc
+     * @see the class description for this Provider.
+     * This method is just a singleton guard, the real work is done by provideAsStateImpl.
+     */
     provideAsState(): State<T>;
+    /**
+     * @inheritDoc
+     * This specialization returns undefined if 'asyncOnly' is true and there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous).
+     */
     resolveIfSingleton(asyncOnly: boolean): Promise<T>;
-    protected makePostConstructState(obj: any): State<T>;
-    protected getConstructorParameterStates<T>(): State[];
+    /**
+     * Make a resolved or pending State that reflects any @PostConstruct annotations.
+     */
+    protected makePostConstructState(obj: T): State<T>;
+    /**
+     * This method collects the States of all the constructor parameters for our target class.
+     */
+    protected getConstructorParameterStates(): State[];
+    /**
+     * Gather the needed constructor parameters, invoke the constructor, and figure out what post construction needs done.
+     */
     private provideAsStateImpl;
 }

package/lib/esm/class-provider.js

@@ -2,11 +2,21 @@ import { BindableProvider } from './bindable-provider';
 import { POSTCONSTRUCT_ASYNC_METADATA_KEY, POSTCONSTRUCT_SYNC_METADATA_KEY, REFLECT_PARAMS } from './constants';
 import { _getInjectedIdAt, _getOptionalDefaultAt } from './decorators';
 import { State } from './state';
+import { isPromise } from './utils';
+/**
+ * @inheritDoc
+ * This specialization invokes it's configured class constructor synchronously and then scans for (and invokes) any @PostConstruct (which may be synchronous or asynchronous).
+ */
 export class ClassBasedProvider extends BindableProvider {
     constructor(injector, id, maker, stateResolver) {
         super(injector, id, maker);
         this.stateResolver = stateResolver;
     }
+    /**
+     * @inheritDoc
+     * @see the class description for this Provider.
+     * This method is just a singleton guard, the real work is done by provideAsStateImpl.
+     */
     provideAsState() {
         let retVal = this.singleton;
         if (!retVal) {
@@ -16,12 +26,20 @@ export class ClassBasedProvider extends BindableProvider {
             this.singleton = retVal;
         return retVal;
     }
+    /**
+     * @inheritDoc
+     * This specialization returns undefined if 'asyncOnly' is true and there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous).
+     */
     resolveIfSingleton(asyncOnly) {
         if ((!asyncOnly) || Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker))
             return super.resolveIfSingleton(false);
         return undefined;
     }
+    /**
+     * Make a resolved or pending State that reflects any @PostConstruct annotations.
+     */
     makePostConstructState(obj) {
+        var _a, _b;
         if (typeof obj === 'object' && (!Array.isArray(obj)) && obj.constructor) {
             let maybeAsync = false;
             let pcFn;
@@ -32,13 +50,16 @@ export class ClassBasedProvider extends BindableProvider {
                 };
             }
             else {
+                /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+                // Check to see if there is a @PostConstruct annotation on a method of the class.
                 let postConstruct = Reflect.getMetadata(POSTCONSTRUCT_SYNC_METADATA_KEY, obj.constructor);
                 if (!postConstruct) {
                     maybeAsync = true;
                     postConstruct = Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, obj.constructor);
                 }
                 if (postConstruct && obj.constructor.prototype[postConstruct] && typeof obj.constructor.prototype[postConstruct] === 'function')
-                    pcFn = obj[postConstruct].bind(obj);
+                    pcFn = (_b = (_a = obj[postConstruct]).bind) === null || _b === void 0 ? void 0 : _b.call(_a, obj);
+                /* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
             }
             if (pcFn) {
                 let result;
@@ -46,81 +67,106 @@ export class ClassBasedProvider extends BindableProvider {
                     result = pcFn();
                 }
                 catch (err) {
+                    // The post construction method threw while executing, give the errorHandler (if any) a crack at recovery.
                     try {
-                        obj = this.queryErrorHandler(err, obj);
+                        obj = this.queryErrorHandler(err, obj); // The returned obj is unlikely to be the original obj.
                         return State.MakeState(null, undefined, obj);
                     }
                     catch (e) {
+                        // could not recover, propagate the error.
                         return State.MakeState(null, e, undefined);
                     }
                 }
-                if (result && (result instanceof Promise || (maybeAsync && typeof result.then === 'function'))) {
+                // The post construction method says it will let us know when it's finished.
+                if (result && (result instanceof Promise || (maybeAsync && isPromise(result)))) {
+                    // Return a State that is pending (the other return statements in this method return a State which is resolved or rejected).
                     return State.MakeState(this.makePromiseForObj(result, () => obj));
                 }
             }
         }
+        // No PostConstruct, just return a resolved State
         return State.MakeState(null, undefined, obj);
     }
+    /**
+     * This method collects the States of all the constructor parameters for our target class.
+     */
     getConstructorParameterStates() {
         const argTypes = Reflect.getMetadata(REFLECT_PARAMS, this.maker);
-        if (argTypes === undefined) {
+        if (argTypes === undefined || !Array.isArray(argTypes)) {
             return [];
         }
         return argTypes.map((argType, index) => {
+            // The reflect-metadata API fails on circular dependencies, and will return undefined for the argument instead.
             if (argType === undefined) {
                 throw new Error(`Injection error. Recursive dependency in constructor for ${this.maker.toString()} at index ${index}`);
             }
+            // Check if an Inject annotation precedes the parameter.
             const overrideToken = _getInjectedIdAt(this.maker, index);
             const actualToken = overrideToken === undefined ? argType : overrideToken;
+            // Ask our configured container to resolve the parameter.
             let param = this.stateResolver(actualToken);
+            // If the parameter could not be resolved, see if there is an @Optional annotation
             if ((!param.pending) && param.rejected) {
-                let md = _getOptionalDefaultAt(this.maker, index);
+                const md = _getOptionalDefaultAt(this.maker, index);
                 if (md)
                     param = State.MakeState(null, undefined, md.value);
             }
             return param;
         });
     }
+    /**
+     * Gather the needed constructor parameters, invoke the constructor, and figure out what post construction needs done.
+     */
     provideAsStateImpl() {
-        let params = this.getConstructorParameterStates();
-        let paramRejection = params.find((p) => {
+        const params = this.getConstructorParameterStates();
+        // If any of the params are in a rejected state, we cannot construct.
+        const paramRejection = params.find((p) => {
             return (!p.pending) && p.rejected;
         });
         if (paramRejection) {
             return paramRejection;
         }
+        // If any of the params are in a pending state, we will have to wait for them to be resolved before we can construct.
         const pendingParams = params.filter((p) => {
             return p.pending;
         }).map((p) => {
             return p.promise;
         });
         if (pendingParams.length > 0) {
-            let objPromise = this.makePromiseForObj(Promise.all(pendingParams), () => {
+            // Some of the parameters needed for construction are not yet available, wait for them and then attempt construction.
+            const objPromise = this.makePromiseForObj(Promise.all(pendingParams), () => {
+                // All the parameters are now available, instantiate the class.
+                // If this throws, it will be handled by our caller.
                 return Reflect.construct(this.maker, params.map((p) => p.fulfilled));
             });
+            // Once the obj is resolved, then we need to check for PostConstruct and if it was async, wait for that too.
             return State.MakeState(objPromise.then((obj) => {
-                let state = this.makePostConstructState(obj);
+                const state = this.makePostConstructState(obj);
                 if (state.pending) {
-                    return state.promise;
+                    return state.promise; // chain (aka wait some more).
                 }
                 else if (state.rejected) {
-                    return state.rejected;
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                    return state.rejected; // error
                 }
                 else {
-                    return state.fulfilled;
+                    return state.fulfilled; // value (aka obj).
                 }
             }));
         }
         else {
+            // All parameters needed for construction are available, instantiate the object.
             try {
-                let newObj = Reflect.construct(this.maker, params.map((p) => p.fulfilled));
+                const newObj = Reflect.construct(this.maker, params.map((p) => p.fulfilled));
                 return this.makePostConstructState(newObj);
             }
             catch (err) {
+                // There was an error, give the errorHandler (if any) a crack at recovery.
                 try {
                     return State.MakeState(null, undefined, this.queryErrorHandler(err));
                 }
                 catch (e) {
+                    // could not recover, propagate the error.
                     return State.MakeState(null, e, undefined);
                 }
             }

package/lib/esm/class-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"class-provider.js","sourceRoot":"","sources":["../../src/class-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { BindableProvider } from './bindable-provider';\nimport { POSTCONSTRUCT_ASYNC_METADATA_KEY, POSTCONSTRUCT_SYNC_METADATA_KEY, REFLECT_PARAMS } from './constants';\nimport { _getInjectedIdAt, _getOptionalDefaultAt } from './decorators';\nimport { ClassConstructor, InjectableId, Injector } from './injector';\nimport { State } from './state';\n\nexport type ResolveStateCallback = (id: InjectableId<any>) => State;\n\n/**\n * @inheritDoc\n * This specialization invokes it's configured class constructor synchronously and then scans for (and invokes) any @PostConstruct (which may be synchronous or asynchronous).\n */\nexport class ClassBasedProvider<T> extends BindableProvider<T, ClassConstructor<T>> {\n\tconstructor(injector: Injector, id: InjectableId<T>, maker: ClassConstructor<T>, protected stateResolver: ResolveStateCallback) {\n\t\tsuper(injector, id, maker);\n\t}\n\n\t/**\n\t * @inheritDoc\n\t * @see the class description for this Provider.\n\t * This method is just a singleton guard, the real work is done by provideAsStateImpl.\n\t */\n\tprovideAsState(): State<T> {\n\t\tlet retVal = this.singleton;\n\t\tif (!retVal) {\n\t\t\tretVal = this.provideAsStateImpl();\n\t\t}\n\t\tif (this.singleton === null)\n\t\t\tthis.singleton = retVal;\n\t\treturn retVal;\n\t}\n\n\t/**\n\t * @inheritDoc\n\t * This specialization returns undefined if 'asyncOnly' is true and there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous).\n\t */\n\tresolveIfSingleton(asyncOnly: boolean): Promise<T> {\n\t\t// @ts-ignore\n\t\tif ((!asyncOnly) || Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker))\n\t\t\treturn super.resolveIfSingleton(false);\n\t\treturn undefined;\n\t}\n\n\t/**\n\t * Make a resolved or pending State that reflects any @PostConstruct annotations.\n\t */\n\tprotected makePostConstructState(obj: any) {\n\t\tif (typeof obj === 'object' && (!Array.isArray(obj)) && obj.constructor) {\n\t\t\tlet maybeAsync = false;\n\t\t\tlet pcFn: Function;\n\t\t\tif (typeof this.successHandler === 'function') {\n\t\t\t\tmaybeAsync = true;\n\t\t\t\tpcFn = () => {\n\t\t\t\t\treturn this.successHandler(obj, this.injector, this.id, this.maker);\n\t\t\t\t};\n\t\t\t} else {\n\t\t\t\t// Check to see if there is a @PostConstruct annotation on a method of the class.\n\t\t\t\t// @ts-ignore\n\t\t\t\tlet postConstruct = Reflect.getMetadata(POSTCONSTRUCT_SYNC_METADATA_KEY, obj.constructor);\n\t\t\t\tif (!postConstruct) {\n\t\t\t\t\tmaybeAsync = true;\n\t\t\t\t\t// @ts-ignore\n\t\t\t\t\tpostConstruct = Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, obj.constructor);\n\t\t\t\t}\n\t\t\t\tif (postConstruct && obj.constructor.prototype[postConstruct] && typeof obj.constructor.prototype[postConstruct] === 'function')\n\t\t\t\t\tpcFn = obj[postConstruct].bind(obj);\n\t\t\t}\n\t\t\tif (pcFn) {\n\t\t\t\tlet result;\n\t\t\t\ttry {\n\t\t\t\t\tresult = pcFn();\n\t\t\t\t}\n\t\t\t\tcatch (err) {\n\t\t\t\t\t// The post construction method threw while executing, give the errorHandler (if any) a crack at recovery.\n\t\t\t\t\ttry {\n\t\t\t\t\t\tobj = this.queryErrorHandler(err, obj); // The returned obj is unlikely to be the original obj.\n\t\t\t\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t\t\t\t}\n\t\t\t\t\tcatch (e) {\n\t\t\t\t\t\t// could not recover, propagate the error.\n\t\t\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t// The post construction method says it will let us know when it's finished.\n\t\t\t\tif (result && (result instanceof Promise || (maybeAsync && typeof result.then === 'function'))) {\n\t\t\t\t\t// Return a State that is pending (the other return statements in this method return a State which is resolved or rejected).\n\t\t\t\t\treturn State.MakeState<T>(this.makePromiseForObj<void>(result, () => obj));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\t// No PostConstruct, just return a resolved State\n\t\treturn State.MakeState<T>(null, undefined, obj);\n\t}\n\n\t/**\n\t * This method collects the States of all the constructor parameters for our target class.\n\t */\n\tprotected getConstructorParameterStates<T>(): State[] {\n\t\t// @ts-ignore\n\t\tconst argTypes = Reflect.getMetadata(REFLECT_PARAMS, this.maker);\n\t\tif (argTypes === undefined) {\n\t\t\treturn [];\n\t\t}\n\t\treturn argTypes.map((argType, index) => {\n\t\t\t// The reflect-metadata API fails on circular dependencies, and will return undefined for the argument instead.\n\t\t\tif (argType === undefined) {\n\t\t\t\tthrow new Error(`Injection error. Recursive dependency in constructor for ${this.maker.toString()} at index ${index}`);\n\t\t\t}\n\t\t\t// Check if an Inject annotation precedes the parameter.\n\t\t\tconst overrideToken = _getInjectedIdAt(this.maker, index);\n\t\t\tconst actualToken = overrideToken === undefined ? argType : overrideToken;\n\t\t\t// Ask our configured container to resolve the parameter.\n\t\t\tlet param = this.stateResolver(actualToken);\n\t\t\t// If the parameter could not be resolved, see if there is an @Optional annotation\n\t\t\tif ((!param.pending) && param.rejected) {\n\t\t\t\tlet md = _getOptionalDefaultAt(this.maker, index);\n\t\t\t\tif (md)\n\t\t\t\t\tparam = State.MakeState<any>(null, undefined, md.value);\n\t\t\t}\n\t\t\treturn param;\n\t\t});\n\t}\n\n\t/**\n\t * Gather the needed constructor parameters, invoke the constructor, and figure out what post construction needs done.\n\t */\n\tprivate provideAsStateImpl(): State<T> {\n\t\tlet params = this.getConstructorParameterStates();\n\n\t\t// If any of the params are in a rejected state, we cannot construct.\n\t\tlet paramRejection = params.find((p) => {\n\t\t\treturn (!p.pending) && p.rejected;\n\t\t});\n\t\tif (paramRejection) {\n\t\t\treturn paramRejection;\n\t\t}\n\t\t// If any of the params are in a pending state, we will have to wait for them to be resolved before we can construct.\n\t\tconst pendingParams = params.filter((p) => {\n\t\t\treturn p.pending;\n\t\t}).map((p) => {\n\t\t\treturn p.promise;\n\t\t});\n\t\tif (pendingParams.length > 0) {\n\t\t\t// Some of the parameters needed for construction are not yet available, wait for them and then attempt construction.\n\t\t\tlet objPromise = this.makePromiseForObj<any[]>(Promise.all(pendingParams), () => {\n\t\t\t\t// All the parameters are now available, instantiate the class.\n\t\t\t\t// If this throws, it will be handled by our caller.\n\t\t\t\treturn Reflect.construct(this.maker, params.map((p) => p.fulfilled));\n\t\t\t});\n\t\t\t// Once the obj is resolved, then we need to check for PostConstruct and if it was async, wait for that too.\n\t\t\treturn State.MakeState<T>(objPromise.then((obj) => {\n\t\t\t\tlet state = this.makePostConstructState(obj);\n\t\t\t\tif (state.pending) {\n\t\t\t\t\treturn state.promise;   // chain (aka wait some more).\n\t\t\t\t}\n\t\t\t\telse if (state.rejected) {\n\t\t\t\t\treturn state.rejected;  // error\n\t\t\t\t}\n\t\t\t\telse {\n\t\t\t\t\treturn state.fulfilled; // value (aka obj).\n\t\t\t\t}\n\t\t\t}));\n\t\t}\n\t\telse {\n\t\t\t// All parameters needed for construction are available, instantiate the object.\n\t\t\ttry {\n\t\t\t\tlet newObj = Reflect.construct(this.maker, params.map((p) => p.fulfilled));\n\t\t\t\treturn this.makePostConstructState(newObj);\n\t\t\t}\n\t\t\tcatch (err) {\n\t\t\t\t// There was an error, give the errorHandler (if any) a crack at recovery.\n\t\t\t\ttry {\n\t\t\t\t\treturn State.MakeState<T>(null, undefined, this.queryErrorHandler(err));\n\t\t\t\t}\n\t\t\t\tcatch (e) {\n\t\t\t\t\t// could not recover, propagate the error.\n\t\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"class-provider.js","sourceRoot":"","sources":["../../src/class-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { BindableProvider } from './bindable-provider';\nimport { POSTCONSTRUCT_ASYNC_METADATA_KEY, POSTCONSTRUCT_SYNC_METADATA_KEY, REFLECT_PARAMS } from './constants';\nimport { _getInjectedIdAt, _getOptionalDefaultAt } from './decorators';\nimport { ClassConstructor, InjectableId, Injector } from './injector';\nimport { State } from './state';\nimport { isPromise } from './utils';\n\nexport type ResolveStateCallback = (id: InjectableId<any>) => State;\n\n/**\n * @inheritDoc\n * This specialization invokes it's configured class constructor synchronously and then scans for (and invokes) any @PostConstruct (which may be synchronous or asynchronous).\n */\nexport class ClassBasedProvider<T> extends BindableProvider<T, ClassConstructor<T>> {\n\tconstructor(injector: Injector, id: InjectableId<T>, maker: ClassConstructor<T>, protected stateResolver: ResolveStateCallback) {\n\t\tsuper(injector, id, maker);\n\t}\n\n\t/**\n\t * @inheritDoc\n\t * @see the class description for this Provider.\n\t * This method is just a singleton guard, the real work is done by provideAsStateImpl.\n\t */\n\tprovideAsState(): State<T> {\n\t\tlet retVal = this.singleton;\n\t\tif (!retVal) {\n\t\t\tretVal = this.provideAsStateImpl();\n\t\t}\n\t\tif (this.singleton === null)\n\t\t\tthis.singleton = retVal;\n\t\treturn retVal;\n\t}\n\n\t/**\n\t * @inheritDoc\n\t * This specialization returns undefined if 'asyncOnly' is true and there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous).\n\t */\n\tresolveIfSingleton(asyncOnly: boolean): Promise<T> {\n\t\tif ((!asyncOnly) || Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker))\n\t\t\treturn super.resolveIfSingleton(false);\n\t\treturn undefined;\n\t}\n\n\t/**\n\t * Make a resolved or pending State that reflects any @PostConstruct annotations.\n\t */\n\tprotected makePostConstructState(obj: T): State<T> {\n\t\tif (typeof obj === 'object' && (!Array.isArray(obj)) && obj.constructor) {\n\t\t\tlet maybeAsync = false;\n\t\t\tlet pcFn: () => void | Error | Promise<void | Error>;\n\t\t\tif (typeof this.successHandler === 'function') {\n\t\t\t\tmaybeAsync = true;\n\t\t\t\tpcFn = () => {\n\t\t\t\t\treturn this.successHandler(obj, this.injector, this.id, this.maker);\n\t\t\t\t};\n\t\t\t} else {\n\t\t\t\t/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */\n\t\t\t\t// Check to see if there is a @PostConstruct annotation on a method of the class.\n\t\t\t\tlet postConstruct: string = Reflect.getMetadata(POSTCONSTRUCT_SYNC_METADATA_KEY, obj.constructor);\n\t\t\t\tif (!postConstruct) {\n\t\t\t\t\tmaybeAsync = true;\n\t\t\t\t\tpostConstruct = Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, obj.constructor);\n\t\t\t\t}\n\t\t\t\tif (postConstruct && obj.constructor.prototype[postConstruct] && typeof obj.constructor.prototype[postConstruct] === 'function')\n\t\t\t\t\tpcFn = obj[postConstruct].bind?.(obj);\n\n\t\t\t\t/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */\n\t\t\t}\n\t\t\tif (pcFn) {\n\t\t\t\tlet result: any;\n\t\t\t\ttry {\n\t\t\t\t\tresult = pcFn();\n\t\t\t\t}\n\t\t\t\tcatch (err) {\n\t\t\t\t\t// The post construction method threw while executing, give the errorHandler (if any) a crack at recovery.\n\t\t\t\t\ttry {\n\t\t\t\t\t\tobj = this.queryErrorHandler(err, obj); // The returned obj is unlikely to be the original obj.\n\t\t\t\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t\t\t\t}\n\t\t\t\t\tcatch (e) {\n\t\t\t\t\t\t// could not recover, propagate the error.\n\t\t\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t// The post construction method says it will let us know when it's finished.\n\t\t\t\tif (result && (result instanceof Promise || (maybeAsync && isPromise<void>(result)))) {\n\t\t\t\t\t// Return a State that is pending (the other return statements in this method return a State which is resolved or rejected).\n\t\t\t\t\treturn State.MakeState<T>(this.makePromiseForObj<void>(result, () => obj));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\t// No PostConstruct, just return a resolved State\n\t\treturn State.MakeState<T>(null, undefined, obj);\n\t}\n\n\t/**\n\t * This method collects the States of all the constructor parameters for our target class.\n\t */\n\tprotected getConstructorParameterStates(): State[] {\n\t\tconst argTypes = Reflect.getMetadata(REFLECT_PARAMS, this.maker);\n\t\tif (argTypes === undefined || !Array.isArray(argTypes)) {\n\t\t\treturn [];\n\t\t}\n\t\treturn argTypes.map((argType, index) => {\n\t\t\t// The reflect-metadata API fails on circular dependencies, and will return undefined for the argument instead.\n\t\t\tif (argType === undefined) {\n\t\t\t\tthrow new Error(`Injection error. Recursive dependency in constructor for ${this.maker.toString()} at index ${index}`);\n\t\t\t}\n\t\t\t// Check if an Inject annotation precedes the parameter.\n\t\t\tconst overrideToken = _getInjectedIdAt(this.maker, index);\n\t\t\tconst actualToken = overrideToken === undefined ? argType : overrideToken;\n\t\t\t// Ask our configured container to resolve the parameter.\n\t\t\tlet param = this.stateResolver(actualToken);\n\t\t\t// If the parameter could not be resolved, see if there is an @Optional annotation\n\t\t\tif ((!param.pending) && param.rejected) {\n\t\t\t\tconst md = _getOptionalDefaultAt(this.maker, index);\n\t\t\t\tif (md)\n\t\t\t\t\tparam = State.MakeState<any>(null, undefined, md.value);\n\t\t\t}\n\t\t\treturn param;\n\t\t});\n\t}\n\n\t/**\n\t * Gather the needed constructor parameters, invoke the constructor, and figure out what post construction needs done.\n\t */\n\tprivate provideAsStateImpl(): State<T> {\n\t\tconst params = this.getConstructorParameterStates();\n\n\t\t// If any of the params are in a rejected state, we cannot construct.\n\t\tconst paramRejection = params.find((p) => {\n\t\t\treturn (!p.pending) && p.rejected;\n\t\t});\n\t\tif (paramRejection) {\n\t\t\treturn paramRejection as State<T>;\n\t\t}\n\t\t// If any of the params are in a pending state, we will have to wait for them to be resolved before we can construct.\n\t\tconst pendingParams = params.filter((p) => {\n\t\t\treturn p.pending;\n\t\t}).map((p) => {\n\t\t\treturn p.promise;\n\t\t});\n\t\tif (pendingParams.length > 0) {\n\t\t\t// Some of the parameters needed for construction are not yet available, wait for them and then attempt construction.\n\t\t\tconst objPromise = this.makePromiseForObj<any[]>(Promise.all(pendingParams), () => {\n\t\t\t\t// All the parameters are now available, instantiate the class.\n\t\t\t\t// If this throws, it will be handled by our caller.\n\t\t\t\treturn Reflect.construct(this.maker, params.map((p) => p.fulfilled as unknown)) as T;\n\t\t\t});\n\t\t\t// Once the obj is resolved, then we need to check for PostConstruct and if it was async, wait for that too.\n\t\t\treturn State.MakeState<T>(objPromise.then((obj) => {\n\t\t\t\tconst state = this.makePostConstructState(obj);\n\t\t\t\tif (state.pending) {\n\t\t\t\t\treturn state.promise;   // chain (aka wait some more).\n\t\t\t\t}\n\t\t\t\telse if (state.rejected) {\n\t\t\t\t\t// eslint-disable-next-line @typescript-eslint/no-unsafe-return\n\t\t\t\t\treturn state.rejected as any; // error\n\t\t\t\t}\n\t\t\t\telse {\n\t\t\t\t\treturn state.fulfilled; // value (aka obj).\n\t\t\t\t}\n\t\t\t}));\n\t\t}\n\t\telse {\n\t\t\t// All parameters needed for construction are available, instantiate the object.\n\t\t\ttry {\n\t\t\t\tconst newObj = Reflect.construct(this.maker, params.map((p) => p.fulfilled as unknown));\n\t\t\t\treturn this.makePostConstructState(newObj);\n\t\t\t}\n\t\t\tcatch (err) {\n\t\t\t\t// There was an error, give the errorHandler (if any) a crack at recovery.\n\t\t\t\ttry {\n\t\t\t\t\treturn State.MakeState<T>(null, undefined, this.queryErrorHandler(err));\n\t\t\t\t}\n\t\t\t\tcatch (e) {\n\t\t\t\t\t// could not recover, propagate the error.\n\t\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

package/lib/esm/constant-provider.d.ts

@@ -1,5 +1,9 @@
-import { State } from './state';
 import { Provider } from './provider';
+import { State } from './state';
+/**
+ * @inheritDoc
+ * This specialization is always a Singleton.
+ */
 export declare class ConstantProvider<T> extends Provider<T> {
     constructor(constant: T);
     provideAsState(): State<T>;

package/lib/esm/constant-provider.js

@@ -1,5 +1,9 @@
-import { State } from './state';
 import { Provider } from './provider';
+import { State } from './state';
+/**
+ * @inheritDoc
+ * This specialization is always a Singleton.
+ */
 export class ConstantProvider extends Provider {
     constructor(constant) {
         super();

package/lib/esm/constant-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"constant-provider.js","sourceRoot":"","sources":["../../src/constant-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAMpC,MAAM,OAAO,gBAAoB,SAAQ,QAAW;IACnD,YAAY,QAAW;QACtB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAI,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;CACD","sourcesContent":["import {State} from './state';\nimport {Provider} from './provider';\n\n/**\n * @inheritDoc\n * This specialization is always a Singleton.\n */\nexport class ConstantProvider<T> extends Provider<T> {\n\tconstructor(constant: T) {\n\t\tsuper();\n\t\tthis.singleton = State.MakeState<T>(null, undefined, constant);\n\t}\n\n\tprovideAsState(): State<T> {\n\t\treturn this.singleton;\n\t}\n}\n"]}
+{"version":3,"file":"constant-provider.js","sourceRoot":"","sources":["../../src/constant-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC;;;GAGG;AACH,MAAM,OAAO,gBAAoB,SAAQ,QAAW;IACnD,YAAY,QAAW;QACtB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAI,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;CACD","sourcesContent":["import { Provider } from './provider';\nimport { State } from './state';\n\n/**\n * @inheritDoc\n * This specialization is always a Singleton.\n */\nexport class ConstantProvider<T> extends Provider<T> {\n\tconstructor(constant: T) {\n\t\tsuper();\n\t\tthis.singleton = State.MakeState<T>(null, undefined, constant);\n\t}\n\n\tprovideAsState(): State<T> {\n\t\treturn this.singleton;\n\t}\n}\n"]}

package/lib/esm/constants.d.ts

@@ -2,6 +2,7 @@ export declare const INJECTABLE_METADATA_KEY: unique symbol;
 export declare const INJECT_METADATA_KEY: unique symbol;
 export declare const POSTCONSTRUCT_SYNC_METADATA_KEY: unique symbol;
 export declare const POSTCONSTRUCT_ASYNC_METADATA_KEY: unique symbol;
+export declare const RELEASE_METADATA_KEY: unique symbol;
 export declare const OPTIONAL_METADATA_KEY: unique symbol;
 export declare const REFLECT_PARAMS = "design:paramtypes";
 export declare const REFLECT_RETURN = "design:returntype";

package/lib/esm/constants.js

@@ -2,6 +2,7 @@ export const INJECTABLE_METADATA_KEY = Symbol('INJECTABLE_KEY');
 export const INJECT_METADATA_KEY = Symbol('INJECT_KEY');
 export const POSTCONSTRUCT_SYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_SYNC_KEY');
 export const POSTCONSTRUCT_ASYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_ASYNC_KEY');
+export const RELEASE_METADATA_KEY = Symbol('RELEASE_KEY');
 export const OPTIONAL_METADATA_KEY = Symbol('OPTIONAL_KEY');
 export const REFLECT_PARAMS = 'design:paramtypes';
 export const REFLECT_RETURN = 'design:returntype';

package/lib/esm/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAC","sourcesContent":["export const INJECTABLE_METADATA_KEY = Symbol('INJECTABLE_KEY');\nexport const INJECT_METADATA_KEY = Symbol('INJECT_KEY');\nexport const POSTCONSTRUCT_SYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_SYNC_KEY');\nexport const POSTCONSTRUCT_ASYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_ASYNC_KEY');\nexport const OPTIONAL_METADATA_KEY = Symbol('OPTIONAL_KEY');\n\nexport const REFLECT_PARAMS = 'design:paramtypes';\nexport const REFLECT_RETURN = 'design:returntype';\n"]}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAC","sourcesContent":["export const INJECTABLE_METADATA_KEY = Symbol('INJECTABLE_KEY');\nexport const INJECT_METADATA_KEY = Symbol('INJECT_KEY');\nexport const POSTCONSTRUCT_SYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_SYNC_KEY');\nexport const POSTCONSTRUCT_ASYNC_METADATA_KEY = Symbol('POSTCONSTRUCT_ASYNC_KEY');\nexport const RELEASE_METADATA_KEY = Symbol('RELEASE_KEY');\nexport const OPTIONAL_METADATA_KEY = Symbol('OPTIONAL_KEY');\n\nexport const REFLECT_PARAMS = 'design:paramtypes';\nexport const REFLECT_RETURN = 'design:returntype';\n"]}

package/lib/esm/container.d.ts

@@ -2,19 +2,72 @@ import { AsyncFactory, BindAs, Binder, SyncFactory } from './binder';
 import { AbstractConstructor, ClassConstructor, InjectableId, Injector } from './injector';
 import { Provider } from './provider';
 import { State } from './state';
+/**
+ * Binder and Injector (aka Container) to handle (a)synchronous dependency management.
+ */
 export declare class Container implements Binder {
     protected parent?: Injector;
+    /**
+     * Create a new Container, with an optional parent Injector which will be searched if any given InjectableId is not bound within this Container.
+     */
     constructor(parent?: Injector);
     protected providers: Map<InjectableId<any>, Provider<any>>;
+    /**
+     * @inheritDoc
+     */
     isIdKnown<T>(id: InjectableId<T>, ascending?: boolean): boolean;
+    /**
+     * @inheritDoc
+     */
     get<T>(id: InjectableId<T>): T;
+    /**
+     * @inheritDoc
+     */
     resolve<T>(id: InjectableId<T>): Promise<T>;
-    removeBinding<T>(id: InjectableId<T>, ascending?: boolean): void;
+    /**
+     * This method is not part of the Binding interface, because it is highly unusual.
+     * But that doesn't mean we can't imagine scenarios where you might require it.
+     *
+     * @param id    The id to be removed.
+     * @param ascending  If true, this will remove all bindings of the specified id all the way up the parent container chain (if it exists).
+     * @param releaseIfSingleton  If true, @Provider.releaseIfSingleton will be invoked before the binding is removed.
+     */
+    removeBinding<T>(id: InjectableId<T>, ascending?: boolean, releaseIfSingleton?: boolean): void;
+    /**
+     * @inheritDoc
+     */
     bindConstant<T>(id: InjectableId<T>, value: T): void;
+    /**
+     * @inheritDoc
+     */
     bindClass<T>(id: ClassConstructor<T>, constructor?: ClassConstructor<T>): BindAs<T, ClassConstructor<T>>;
     bindClass<T>(id: string | symbol | AbstractConstructor<T>, constructor: ClassConstructor<T>): BindAs<T, ClassConstructor<T>>;
+    /**
+     * @inheritDoc
+     */
     bindFactory<T>(id: InjectableId<T>, factory: SyncFactory<T>): BindAs<T, SyncFactory<T>>;
+    /**
+     * @inheritDoc
+     */
     bindAsyncFactory<T>(id: InjectableId<T>, factory: AsyncFactory<T>): BindAs<T, AsyncFactory<T>>;
+    /**
+     * @inheritDoc
+     */
     resolveSingletons(asyncOnly?: boolean, parentRecursion?: boolean): Promise<void>;
+    /**
+     * As implied by the name prefix, this is a factored out method invoked only by the 'resolve' method.
+     * It makes searching our parent (if it exists) easier (and quicker) IF our parent is a fellow instance of Container.
+     */
     protected resolveState<T>(id: InjectableId<T>): State<T>;
+    /**
+     * Convenience method to assist in releasing non-garbage-collectable resources that Singletons in this Container may have allocated.
+     * It will walk through all registered Providers (of this Container only), and invoke their @see Provider.releaseIfSingleton method.
+     * This method is not part of the Binding interface, because you normally only create (and release) Containers.
+     * NOTE:
+     * This *only* releases active/pending Singleton's that have already been created by this Container.
+     * The most likely use of this method would be when you have created a new child Container for a limited duration transaction, and you want to easily cleanup temporary resources.
+     * For example, your service object may need to know when it should unsubscribe from an RxJs stream (failure to do so can result in your Singleton not being garbage collected at the end of a transaction).
+     * In theory, you could handle all unsubscription and cleanup yourself, but the @Release decorator and this method are meant to simply make that easier.
+     */
+    releaseSingletons(): void;
 }

package/lib/esm/container.js

@@ -4,16 +4,31 @@ import { ConstantProvider } from './constant-provider';
 import { INJECTABLE_METADATA_KEY } from './constants';
 import { State } from './state';
 import { FactoryBasedProvider } from './sync-factory-provider';
+import { isPromise } from './utils';
+/**
+ * Helper class to ensure we can distinguish between Error instances legitimately returned from Providers, and Errors thrown by Providers.
+ *
+ * @see resolveSingletons.
+ */
 class ReasonWrapper {
     constructor(reason) {
         this.reason = reason;
     }
 }
+/**
+ * Binder and Injector (aka Container) to handle (a)synchronous dependency management.
+ */
 export class Container {
+    /**
+     * Create a new Container, with an optional parent Injector which will be searched if any given InjectableId is not bound within this Container.
+     */
     constructor(parent) {
         this.parent = parent;
         this.providers = new Map();
     }
+    /**
+     * @inheritDoc
+     */
     isIdKnown(id, ascending) {
         if (!!this.providers.get(id))
             return true;
@@ -21,23 +36,29 @@ export class Container {
             return this.parent.isIdKnown(id, true);
         return false;
     }
+    /**
+     * @inheritDoc
+     */
     get(id) {
-        let provider = this.providers.get(id);
+        const provider = this.providers.get(id);
         if (!provider) {
             if (this.parent)
                 return this.parent.get(id);
             throw new Error('Symbol not bound: ' + id.toString());
         }
-        let state = provider.provideAsState();
+        const state = provider.provideAsState();
         if (state.pending)
             throw new Error('Synchronous request on unresolved asynchronous dependency tree: ' + id.toString());
         if (state.rejected)
             throw state.rejected;
         return state.fulfilled;
     }
+    /**
+     * @inheritDoc
+     */
     resolve(id) {
-        let state = this.resolveState(id);
-        if (state.promise) {
+        const state = this.resolveState(id);
+        if (isPromise(state.promise)) {
             return state.promise;
         }
         if (state.rejected) {
@@ -45,11 +66,31 @@ export class Container {
         }
         return Promise.resolve(state.fulfilled);
     }
-    removeBinding(id, ascending) {
+    // noinspection JSUnusedGlobalSymbols
+    /**
+     * This method is not part of the Binding interface, because it is highly unusual.
+     * But that doesn't mean we can't imagine scenarios where you might require it.
+     *
+     * @param id    The id to be removed.
+     * @param ascending  If true, this will remove all bindings of the specified id all the way up the parent container chain (if it exists).
+     * @param releaseIfSingleton  If true, @Provider.releaseIfSingleton will be invoked before the binding is removed.
+     */
+    removeBinding(id, ascending, releaseIfSingleton) {
+        var _a;
+        if (releaseIfSingleton) {
+            const p = this.providers.get(id);
+            if (p)
+                p.releaseIfSingleton();
+        }
         this.providers.delete(id);
-        if (ascending && this.parent && this.parent.removeBinding)
-            this.parent.removeBinding(id, true);
+        if (ascending && this.parent) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+            (_a = this.parent) === null || _a === void 0 ? void 0 : _a.removeBinding(id, true, releaseIfSingleton);
+        }
     }
+    /**
+     * @inheritDoc
+     */
     bindConstant(id, value) {
         this.providers.set(id, new ConstantProvider(value));
     }
@@ -60,62 +101,87 @@ export class Container {
         if (!Reflect.getMetadata(INJECTABLE_METADATA_KEY, constructor)) {
             throw new Error('Class not decorated with @Injectable [' + constructor.toString() + ']');
         }
-        let provider = new ClassBasedProvider(this, id, constructor, (i) => {
+        const provider = new ClassBasedProvider(this, id, constructor, (i) => {
             return this.resolveState(i);
         });
         this.providers.set(id, provider);
         return provider.makeBindAs();
     }
+    /**
+     * @inheritDoc
+     */
     bindFactory(id, factory) {
-        let provider = new FactoryBasedProvider(this, id, factory);
+        const provider = new FactoryBasedProvider(this, id, factory);
         this.providers.set(id, provider);
         return provider.makeBindAs();
     }
+    /**
+     * @inheritDoc
+     */
     bindAsyncFactory(id, factory) {
-        let provider = new AsyncFactoryBasedProvider(this, id, factory);
+        const provider = new AsyncFactoryBasedProvider(this, id, factory);
         this.providers.set(id, provider);
         return provider.makeBindAs();
     }
+    /**
+     * @inheritDoc
+     */
     resolveSingletons(asyncOnly, parentRecursion) {
-        let makePromiseToResolve = () => {
+        var _a;
+        const makePromiseToResolve = () => {
             return new Promise((resolve, reject) => {
-                let pending = new Map();
+                const pending = new Map();
+                // Ask each provider to resolve itself *IF* it is a singleton.
                 this.providers.forEach((value, key) => {
-                    let p = value.resolveIfSingleton(asyncOnly);
-                    if (p)
+                    // If the provider is a singleton *and* if resolution is being handled asynchronously, the provider will return a completion promise.
+                    const p = value.resolveIfSingleton(asyncOnly);
+                    if (p !== null && typeof p !== 'undefined')
                         pending.set(key, p);
                 });
-                let pp = Array.from(pending.values());
-                let keys = Array.from(pending.keys());
-                Promise.all(pp.map(p => p.catch(e => new ReasonWrapper(e)))).then((results) => {
-                    let rejects = new Map();
+                // The contract for this method is that it behaves somewhat like Promise.allSettled (e.g. won't complete until all pending Singletons have settled).
+                // Further the contract states that if any of the asynchronous Singletons rejected, that we will also return a rejected Promise, and that the rejection reason will be a Map of the InjectableId's that did not resolve, and the Error they emitted.
+                const pp = Array.from(pending.values());
+                const keys = Array.from(pending.keys());
+                // Mapping the catch is an alternate version of Promise.allSettled (e.g. keeps Promise.all from short-circuiting).
+                Promise.all(pp
+                    .map(p => p.catch(e => new ReasonWrapper(e))))
+                    .then((results) => {
+                    const rejects = new Map();
+                    // Check the results.  Since we don't export ReasonWrapper, it is safe to assume that an instance of that was produced by our map => catch code above, so it's a rejected Singleton error.
                     results.forEach((result, idx) => {
                         if (result instanceof ReasonWrapper) {
                             rejects.set(keys[idx], result.reason);
                         }
                     });
+                    // If we had rejections, notify our caller what they were.
                     if (rejects.size > 0)
                         reject(rejects);
                     else
-                        resolve();
+                        resolve(); // All good.
                 });
             });
         };
-        if (parentRecursion && this.parent && this.parent.resolveSingletons) {
-            let pb = this.parent;
+        if (parentRecursion && typeof ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.resolveSingletons) === "function") {
+            const pb = this.parent;
             return pb.resolveSingletons(asyncOnly, parentRecursion).then(() => {
                 return makePromiseToResolve();
             });
         }
         return makePromiseToResolve();
     }
+    /**
+     * As implied by the name prefix, this is a factored out method invoked only by the 'resolve' method.
+     * It makes searching our parent (if it exists) easier (and quicker) IF our parent is a fellow instance of Container.
+     */
     resolveState(id) {
-        let provider = this.providers.get(id);
+        const provider = this.providers.get(id);
         if (!provider) {
             if (this.parent) {
                 if (this.parent instanceof Container) {
                     return this.parent.resolveState(id);
                 }
+                // This code (below) will only ever execute if the creator of this container passes in their own implementation of an Injector.
+                /* istanbul ignore next  */
                 try {
                     return State.MakeState(this.parent.resolve(id), undefined, undefined);
                 }
@@ -127,5 +193,21 @@ export class Container {
         }
         return provider.provideAsState();
     }
+    // noinspection JSUnusedGlobalSymbols
+    /**
+     * Convenience method to assist in releasing non-garbage-collectable resources that Singletons in this Container may have allocated.
+     * It will walk through all registered Providers (of this Container only), and invoke their @see Provider.releaseIfSingleton method.
+     * This method is not part of the Binding interface, because you normally only create (and release) Containers.
+     * NOTE:
+     * This *only* releases active/pending Singleton's that have already been created by this Container.
+     * The most likely use of this method would be when you have created a new child Container for a limited duration transaction, and you want to easily cleanup temporary resources.
+     * For example, your service object may need to know when it should unsubscribe from an RxJs stream (failure to do so can result in your Singleton not being garbage collected at the end of a transaction).
+     * In theory, you could handle all unsubscription and cleanup yourself, but the @Release decorator and this method are meant to simply make that easier.
+     */
+    releaseSingletons() {
+        this.providers.forEach((value) => {
+            value.releaseIfSingleton();
+        });
+    }
 }
 //# sourceMappingURL=container.js.map