async-injection 2.2.0 → 3.0.0

package/lib/cjs/bindable-provider.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BindableProvider = void 0;
-const provider_js_1 = require("./provider.js");
-const utils_js_1 = require("./utils.js");
+const provider_1 = require("./provider");
+const utils_1 = require("./utils");
 /**
  * @inheritDoc
  * This abstraction is for Providers that can be additionally configured as Singletons and/or configured with error and/or success handling callback(s).
  */
-class BindableProvider extends provider_js_1.Provider {
+class BindableProvider extends provider_1.Provider {
     constructor(injector, id, maker) {
         super();
         this.injector = injector;
@@ -15,7 +15,7 @@ class BindableProvider extends provider_js_1.Provider {
         this.maker = maker;
     }
     /**
-     * Invoked by the Binder to create chain-able configuration
+     * Invoked by the Container to create chain-able configuration
      *
      * @see BindAs
      */
@@ -47,15 +47,15 @@ class BindableProvider extends provider_js_1.Provider {
         if (this.errorHandler) {
             const handlerResult = this.errorHandler(this.injector, this.id, this.maker, err, obj);
             // Error handler wants us to propagate an error.
-            if ((0, utils_js_1.isErrorObj)(handlerResult))
+            if ((0, utils_1.isErrorObj)(handlerResult))
                 throw handlerResult;
-            // Error handler has no opinion, so provideAsState a state that reflects the error we just caught.
+            // Error handler has no opinion, so propagate the error we just caught.
             if (typeof handlerResult === 'undefined')
                 throw err;
             // Error handler provided a valid (fully resolved) replacement.
             return handlerResult;
         }
-        // No error handler, provideAsState a state that reflects the error we just caught.
+        // No error handler, propagate the error we just caught.
         throw err;
     }
     /**
@@ -66,35 +66,22 @@ class BindableProvider extends provider_js_1.Provider {
      * @param waitFor   The supplied Promise.
      * @param cb    Callback to be invoked if the supplied Promise resolves.
      */
-    makePromiseForObj(waitFor, cb) {
-        return new Promise((resolve, reject) => {
-            const errHandlerFn = (err, objValue) => {
-                // There was an error during async post construction, see if an error handler was provided, and if so, see what it wants to do.
-                if (this.errorHandler) {
-                    const handlerResult = this.errorHandler(this.injector, this.id, this.maker, err, objValue);
-                    // Error handler wants us to propagate an alternative error.
-                    if ((0, utils_js_1.isErrorObj)(handlerResult))
-                        err = handlerResult; // Fall thru
-                    else if (typeof handlerResult !== 'undefined') {
-                        resolve(handlerResult); // Error handler provided a replacement, so change the State that we returned from pending to resolved.
-                        return;
-                    }
-                }
-                // This will change the State that we returned from pending to rejected.
-                reject(err);
-            };
-            waitFor.then((result) => {
-                // This will change the State that we returned from pending to resolved.
-                try {
-                    resolve(cb(result));
-                }
-                catch (err) {
-                    errHandlerFn(err, cb(result));
-                }
-            }).catch((err) => {
-                errHandlerFn(err, cb(undefined));
-            });
-        });
+    async makePromiseForObj(waitFor, cb) {
+        let result;
+        try {
+            result = await waitFor;
+        }
+        catch (err) {
+            // waitFor rejected — ask the error handler for recovery, passing cb(undefined) as the partial object value.
+            return this.queryErrorHandler(err, cb(undefined));
+        }
+        try {
+            return cb(result);
+        }
+        catch (err) {
+            // cb threw after a successful resolution — ask the error handler for recovery.
+            return this.queryErrorHandler(err, cb(result));
+        }
     }
 }
 exports.BindableProvider = BindableProvider;

package/lib/cjs/bindable-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindable-provider.js","sourceRoot":"","sources":["../../src/bindable-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import {AsyncFactory, BindAs, OnErrorCallback, OnSuccessCallback, SyncFactory} from './binder.js';\nimport {ClassConstructor, InjectableId, Injector} from './injector.js';\nimport {Provider} from './provider.js';\nimport {isErrorObj} from './utils.js';\n\n/**\n * @inheritDoc\n * This abstraction is for Providers that can be additionally configured as Singletons and/or configured with error and/or success handling callback(s).\n */\nexport abstract class BindableProvider<T, M = ClassConstructor<T> | SyncFactory<T> | AsyncFactory<T>> extends Provider<T> {\n\tprotected constructor(protected injector: Injector, protected id: InjectableId<T>, protected maker: M) {\n\t\tsuper();\n\t}\n\n\t/**\n\t * A user supplied success handling function.\n\t * Default value is undefined.\n\t */\n\tprotected successHandler?: OnSuccessCallback<T, any>;\n\n\t/**\n\t * A user supplied error handling function.\n\t * Default value is undefined.\n\t */\n\tprotected errorHandler?: OnErrorCallback<T, any>;\n\n\t/**\n\t * Invoked by the Binder to create chain-able configuration\n\t *\n\t * @see BindAs\n\t */\n\tmakeBindAs(): BindAs<T, M> {\n\t\tconst retVal: BindAs<T, M> = {\n\t\t\tonError: (cb: OnErrorCallback<T, M>) => {\n\t\t\t\tthis.errorHandler = cb;\n\t\t\t},\n\t\t\tonSuccess: (cb: OnSuccessCallback<T, M>) => {\n\t\t\t\tthis.successHandler = cb;\n\t\t\t\treturn retVal;\n\t\t\t},\n\t\t\tasSingleton: () => {\n\t\t\t\tthis.singleton = null; // Flag state as no longer undefined.\n\t\t\t\treturn retVal;\n\t\t\t}\n\t\t};\n\t\treturn retVal;\n\t}\n\n\t/**\n\t * Encapsulate the logic of invoking any configured error handler, and processing it's result.\n\t *\n\t * @see OnErrorCallback\n\t *\n\t * @returns The object substituted by the callback (otherwise this method throws the appropriate error).\n\t */\n\tprotected queryErrorHandler(err: unknown, obj?: T): T {\n\t\t// There was an error during construction, see if an error handler was provided, and if so, see what it wants to do.\n\t\tif (this.errorHandler) {\n\t\t\tconst handlerResult = this.errorHandler(this.injector, this.id, this.maker, err, obj);\n\t\t\t// Error handler wants us to propagate an error.\n\t\t\tif (isErrorObj(handlerResult))\n\t\t\t\tthrow handlerResult;\n\t\t\t// Error handler has no opinion, so provideAsState a state that reflects the error we just caught.\n\t\t\tif (typeof handlerResult === 'undefined')\n\t\t\t\tthrow err;\n\t\t\t// Error handler provided a valid (fully resolved) replacement.\n\t\t\treturn handlerResult;\n\t\t}\n\t\t// No error handler, provideAsState a state that reflects the error we just caught.\n\t\tthrow err;\n\t}\n\n\t/**\n\t * This is like a retry mechanism that uses the Provider's errorHandler (if any) to attempt recovery whenever the supplied Promise rejects.\n\t * This method returns a Promise that rejects if recovery was not possible.\n\t * If the supplied Promise resolves, then this method passes the result to the callback, and then resolve as whatever that callback returns.\n\t *\n\t * @param waitFor   The supplied Promise.\n\t * @param cb    Callback to be invoked if the supplied Promise resolves.\n\t */\n\tprotected makePromiseForObj<R>(waitFor: Promise<R>, cb: (result: R) => T): Promise<T> {\n\t\treturn new Promise<T>((resolve, reject) => {\n\t\t\tconst errHandlerFn = (err: any, objValue?: T) => {\n\t\t\t\t// There was an error during async post construction, see if an error handler was provided, and if so, see what it wants to do.\n\t\t\t\tif (this.errorHandler) {\n\t\t\t\t\tconst handlerResult = this.errorHandler(this.injector, this.id, this.maker, err, objValue);\n\t\t\t\t\t// Error handler wants us to propagate an alternative error.\n\t\t\t\t\tif (isErrorObj(handlerResult))\n\t\t\t\t\t\terr = handlerResult;   // Fall thru\n\t\t\t\t\telse if (typeof handlerResult !== 'undefined') {\n\t\t\t\t\t\tresolve(handlerResult);    // Error handler provided a replacement, so change the State that we returned from pending to resolved.\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t// This will change the State that we returned from pending to rejected.\n\t\t\t\treject(err);\n\t\t\t};\n\t\t\twaitFor.then(\n\t\t\t\t(result) => {\n\t\t\t\t\t// This will change the State that we returned from pending to resolved.\n\t\t\t\t\ttry {\n\t\t\t\t\t\tresolve(cb(result));\n\t\t\t\t\t}\n\t\t\t\t\tcatch (err) {\n\t\t\t\t\t\terrHandlerFn(err, cb(result));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t).catch(\n\t\t\t\t(err) => {\n\t\t\t\t\terrHandlerFn(err, cb(undefined));\n\t\t\t\t}\n\t\t\t);\n\t\t});\n\t}\n}\n"]}
+{"version":3,"file":"bindable-provider.js","sourceRoot":"","sources":["../../src/bindable-provider.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,mCAAmC;AAEnC;;;GAGG;AACH,MAAsB,gBAAgF,SAAQ,mBAAW;IACxH,YAAgC,QAAkB,EAAY,EAAmB,EAAY,KAAQ;QACpG,KAAK,EAAE,CAAC;QADuB,aAAQ,GAAR,QAAQ,CAAU;QAAY,OAAE,GAAF,EAAE,CAAiB;QAAY,UAAK,GAAL,KAAK,CAAG;IAErG,CAAC;IAcD;;;;OAIG;IACH,UAAU;QACT,MAAM,MAAM,GAAiB;YAC5B,OAAO,EAAE,CAAC,EAAyB,EAAE,EAAE;gBACtC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;YACxB,CAAC;YACD,SAAS,EAAE,CAAC,EAA2B,EAAE,EAAE;gBAC1C,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAC;YACf,CAAC;YACD,WAAW,EAAE,GAAG,EAAE;gBACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,qCAAqC;gBAC5D,OAAO,MAAM,CAAC;YACf,CAAC;SACD,CAAC;QACF,OAAO,MAAM,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACO,iBAAiB,CAAC,GAAY,EAAE,GAAO;QAChD,oHAAoH;QACpH,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACtF,gDAAgD;YAChD,IAAI,IAAA,kBAAU,EAAC,aAAa,CAAC;gBAC5B,MAAM,aAAa,CAAC;YACrB,uEAAuE;YACvE,IAAI,OAAO,aAAa,KAAK,WAAW;gBACvC,MAAM,GAAG,CAAC;YACX,+DAA+D;YAC/D,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,wDAAwD;QACxD,MAAM,GAAG,CAAC;IACX,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,iBAAiB,CAAI,OAAmB,EAAE,EAAoB;QAC7E,IAAI,MAAS,CAAC;QACd,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,EAAE,CAAC;YACZ,4GAA4G;YAC5G,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,SAAyB,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC;YACJ,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,GAAG,EAAE,CAAC;YACZ,+EAA+E;YAC/E,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,MAAW,CAAC,CAAC,CAAC;QACrD,CAAC;IACF,CAAC;CACD;AAxFD,4CAwFC","sourcesContent":["import {AsyncFactory, BindAs, OnErrorCallback, OnSuccessCallback, SyncFactory} from './binding';\nimport {ClassConstructor, InjectableId, Injector} from './injector';\nimport {Provider} from './provider';\nimport {isErrorObj} from './utils';\n\n/**\n * @inheritDoc\n * This abstraction is for Providers that can be additionally configured as Singletons and/or configured with error and/or success handling callback(s).\n */\nexport abstract class BindableProvider<T, M = ClassConstructor<T> | SyncFactory<T> | AsyncFactory<T>> extends Provider<T> {\n\tprotected constructor(protected injector: Injector, protected id: InjectableId<T>, protected maker: M) {\n\t\tsuper();\n\t}\n\n\t/**\n\t * A user supplied success handling function.\n\t * Default value is undefined.\n\t */\n\tprotected successHandler?: OnSuccessCallback<T, any>;\n\n\t/**\n\t * A user supplied error handling function.\n\t * Default value is undefined.\n\t */\n\tprotected errorHandler?: OnErrorCallback<T, any>;\n\n\t/**\n\t * Invoked by the Container to create chain-able configuration\n\t *\n\t * @see BindAs\n\t */\n\tmakeBindAs(): BindAs<T, M> {\n\t\tconst retVal: BindAs<T, M> = {\n\t\t\tonError: (cb: OnErrorCallback<T, M>) => {\n\t\t\t\tthis.errorHandler = cb;\n\t\t\t},\n\t\t\tonSuccess: (cb: OnSuccessCallback<T, M>) => {\n\t\t\t\tthis.successHandler = cb;\n\t\t\t\treturn retVal;\n\t\t\t},\n\t\t\tasSingleton: () => {\n\t\t\t\tthis.singleton = null; // Flag state as no longer undefined.\n\t\t\t\treturn retVal;\n\t\t\t}\n\t\t};\n\t\treturn retVal;\n\t}\n\n\t/**\n\t * Encapsulate the logic of invoking any configured error handler, and processing it's result.\n\t *\n\t * @see OnErrorCallback\n\t *\n\t * @returns The object substituted by the callback (otherwise this method throws the appropriate error).\n\t */\n\tprotected queryErrorHandler(err: unknown, obj?: T): T {\n\t\t// There was an error during construction, see if an error handler was provided, and if so, see what it wants to do.\n\t\tif (this.errorHandler) {\n\t\t\tconst handlerResult = this.errorHandler(this.injector, this.id, this.maker, err, obj);\n\t\t\t// Error handler wants us to propagate an error.\n\t\t\tif (isErrorObj(handlerResult))\n\t\t\t\tthrow handlerResult;\n\t\t\t// Error handler has no opinion, so propagate the error we just caught.\n\t\t\tif (typeof handlerResult === 'undefined')\n\t\t\t\tthrow err;\n\t\t\t// Error handler provided a valid (fully resolved) replacement.\n\t\t\treturn handlerResult;\n\t\t}\n\t\t// No error handler, propagate the error we just caught.\n\t\tthrow err;\n\t}\n\n\t/**\n\t * This is like a retry mechanism that uses the Provider's errorHandler (if any) to attempt recovery whenever the supplied Promise rejects.\n\t * This method returns a Promise that rejects if recovery was not possible.\n\t * If the supplied Promise resolves, then this method passes the result to the callback, and then resolve as whatever that callback returns.\n\t *\n\t * @param waitFor   The supplied Promise.\n\t * @param cb    Callback to be invoked if the supplied Promise resolves.\n\t */\n\tprotected async makePromiseForObj<R>(waitFor: Promise<R>, cb: (result: R) => T): Promise<T> {\n\t\tlet result: R;\n\t\ttry {\n\t\t\tresult = await waitFor;\n\t\t}\n\t\tcatch (err) {\n\t\t\t// waitFor rejected — ask the error handler for recovery, passing cb(undefined) as the partial object value.\n\t\t\treturn this.queryErrorHandler(err, cb(undefined as unknown as R));\n\t\t}\n\t\ttry {\n\t\t\treturn cb(result);\n\t\t}\n\t\tcatch (err) {\n\t\t\t// cb threw after a successful resolution — ask the error handler for recovery.\n\t\t\treturn this.queryErrorHandler(err, cb(result as R));\n\t\t}\n\t}\n}\n"]}

package/lib/cjs/{binder.js → binding.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=binder.js.map
+//# sourceMappingURL=binding.js.map

package/lib/cjs/binding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../src/binding.ts"],"names":[],"mappings":"","sourcesContent":["import {ClassConstructor, InjectableId, Injector} from './injector';\n\n/**\n * Type definition for functions that return a value.\n * The function should return a valid value, but may throw an exception if it cannot.\n */\nexport type SyncFactory<T> = (injector: Injector) => T;\n\n/**\n * Type definition for functions that return a Promise for a value.\n * The function *must* not throw and must return a valid Promise (e.g. pending, resolved, rejected).\n */\nexport type AsyncFactory<T> = (injector: Injector) => Promise<T>;\n\n/**\n * You may bind an error handler which will be invoked if the bound InjectableId could not be put into service.\n * An error handler *must* not throw, but may return an Error that will be propagated back up the call chain.\n *\n * @param injector   The Injector that experienced the error.\n * @param id   The identifier for what was trying to be made.\n * @param maker   The thing that made (or tried to make) the value.  Will be one of type ClassConstructor, SyncFactory, or AsyncFactory, depending on how you registered the binding.\n * @param error   Identifies the problem that occurred.\n * @param value   If the 'maker' was able to create the thing, but it had an error during post construction, the made thing will be passed here.\n * @returns one of 3 results...\n * A substitute thing (kind of like a 'maker' do-over) which must be fully operational (e.g. any `@PostConstruct` will be ignored).\n * An alternate Error which will be propagated back up the call chain.\n * Undefined, which means the 'error' parameter will be propagated back up the call chain.\n */\nexport type OnErrorCallback<T, M = unknown> = (injector: Injector, id: InjectableId<T>, maker: M, error: unknown, value?: T) => T | Error | void;\n\n/**\n * You may bind a success handler which will be invoked just before the bound InjectableId is put into service.\n * This is an alternative to the more preferred `@PostConstruct` decorator for scenarios when usage of that decorator is not feasible.\n * WARNING:\n * By registering a success handler, you override and nullify any `@PostConstruct` decorator on the class.\n * In such a scenario, the success handler should perform whatever care and feeding the class expected from the `@PostConstruct` decorator.\n * A success handler *must* not throw, but may return an Error that will be propagated back up the call chain.\n *\n * @param value   The thing that was made.\n * @param injector   The Injector that performed the construction.\n * @param id   The identifier for what was made.\n * @param maker   The thing that made.  Will be one of type ClassConstructor, SyncFactory, or AsyncFactory, depending on how you registered the binding.\n * @returns one of 3 results...\n * An Error which will be propagated back up the call chain.\n * Undefined, which means the object is ready to be placed into service.\n * A Promise that resolves to one of the above two values (undefined or Error).\n */\nexport type OnSuccessCallback<T, M = unknown> = (value: T, injector: Injector, id: InjectableId<T>, maker: M) => Promise<Error | void> | Error | void;\n\n/**\n * Descriptor object used with {@link Container.register} to specify how an id should be bound.\n * Mirrors the TSyringe registration API.\n */\nexport type RegisterDescriptor<T> =\n\t| { useClass: ClassConstructor<T> }\n\t| { useValue: T }\n\t| { useFactory: SyncFactory<T> }\n\t| { useAsyncFactory: AsyncFactory<T> };\n\n/**\n * An interface allowing binding of an error handler.\n *\n * @see OnErrorCallback\n */\nexport interface BindErrHandler<T, M = unknown> {\n\tonError(cb: OnErrorCallback<T, M>): void;\n}\n\n/**\n * An interface allowing binding of a post construction handler.\n *\n * @see OnSuccessCallback\n */\nexport interface BindHandler<T, M = unknown> extends BindErrHandler<T, M> {\n\tonSuccess(cb: OnSuccessCallback<T, M>): BindErrHandler<T, M>;\n}\n\n/**\n * @inheritDoc\n * This specialization also allows you to specify that the binding is 'Singleton' (e.g. only one in the system).\n */\nexport interface BindAs<T, M = unknown> extends BindHandler<T, M> {\n\tasSingleton(): BindHandler<T, M>;\n}\n\n"]}

package/lib/cjs/class-provider.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassBasedProvider = void 0;
-const bindable_provider_js_1 = require("./bindable-provider.js");
-const constants_js_1 = require("./constants.js");
-const decorators_js_1 = require("./decorators.js");
-const state_js_1 = require("./state.js");
-const utils_js_1 = require("./utils.js");
+const bindable_provider_1 = require("./bindable-provider");
+const constants_1 = require("./constants");
+const decorators_1 = require("./decorators");
+const state_1 = require("./state");
+const utils_1 = require("./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).
  */
-class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
+class ClassBasedProvider extends bindable_provider_1.BindableProvider {
     constructor(injector, id, maker) {
         super(injector, id, maker);
     }
@@ -30,71 +30,172 @@ class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
     }
     /**
      * @inheritDoc
-     * This specialization returns undefined if 'asyncOnly' is true and there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous).
+     * This specialization returns undefined if 'asyncOnly' is true **and** there is no asynchronous PostConstruct annotation (since class constructors can never by asynchronous),
+     * **unless** the @PostConstruct method has injectable parameters, which may themselves require async resolution.
      */
     resolveIfSingleton(asyncOnly) {
-        if ((!asyncOnly) || Reflect.getMetadata(constants_js_1.POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker))
+        if (!asyncOnly || Reflect.getMetadata(constants_1.POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker) || this.postConstructHasParams())
             return super.resolveIfSingleton(false);
         return undefined;
     }
     /**
-     * Make a resolved or pending State that reflects any @PostConstruct annotations.
+     * Returns true if the @PostConstruct method (if any) has at least one parameter.
+     * Any parameter may require async resolution, so this class must participate in resolveSingletons.
+     */
+    postConstructHasParams() {
+        var _a;
+        const pcMethod = (_a = Reflect.getMetadata(constants_1.POSTCONSTRUCT_SYNC_METADATA_KEY, this.maker)) !== null && _a !== void 0 ? _a : Reflect.getMetadata(constants_1.POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker);
+        if (!pcMethod)
+            return false;
+        const paramTypes = Reflect.getMetadata(constants_1.REFLECT_PARAMS, this.maker.prototype, pcMethod);
+        return Array.isArray(paramTypes) && paramTypes.length > 0;
+    }
+    /**
+     * Make a resolved or pending State that reflects any @PostConstruct annotations and/or onSuccess handler.
+     * Any @PostConstruct method (with any injected parameters) runs first; the onSuccess handler runs after.
      */
     makePostConstructState(obj) {
-        var _a, _b;
-        if (typeof obj === 'object' && (!Array.isArray(obj)) && obj.constructor) {
-            let maybeAsync = false;
-            let pcFn;
-            if (typeof this.successHandler === 'function') {
-                maybeAsync = true;
-                pcFn = () => {
-                    return this.successHandler(obj, this.injector, this.id, this.maker);
-                };
+        if (obj === null || typeof obj !== 'object' || Array.isArray(obj) || !obj.constructor) {
+            return state_1.State.MakeState(null, undefined, obj);
+        }
+        const ctor = obj.constructor;
+        // Look up the @PostConstruct method name (sync or async).
+        let pcMaybeAsync = false;
+        let pcMethodName = Reflect.getMetadata(constants_1.POSTCONSTRUCT_SYNC_METADATA_KEY, ctor);
+        if (!pcMethodName) {
+            pcMethodName = Reflect.getMetadata(constants_1.POSTCONSTRUCT_ASYNC_METADATA_KEY, ctor);
+            pcMaybeAsync = !!pcMethodName;
+        }
+        const pcValid = !!(pcMethodName && typeof ctor.prototype[pcMethodName] === 'function');
+        const hasSuccess = typeof this.successHandler === 'function';
+        if (!pcValid && !hasSuccess) {
+            return state_1.State.MakeState(null, undefined, obj);
+        }
+        // Resolve any injectable parameters declared on the @PostConstruct method.
+        const paramStates = pcValid ? this.getMethodParameterStates(ctor, pcMethodName) : [];
+        // A synchronously rejected param (with no @Optional fallback) is treated as a PostConstruct error.
+        const firstRejected = paramStates.find(p => !p.pending && p.rejected);
+        if (firstRejected) {
+            try {
+                obj = this.queryErrorHandler(firstRejected.rejected, obj);
+                return state_1.State.MakeState(null, undefined, obj);
             }
-            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(constants_js_1.POSTCONSTRUCT_SYNC_METADATA_KEY, obj.constructor);
-                if (!postConstruct) {
-                    maybeAsync = true;
-                    postConstruct = Reflect.getMetadata(constants_js_1.POSTCONSTRUCT_ASYNC_METADATA_KEY, obj.constructor);
-                }
-                if (postConstruct && obj.constructor.prototype[postConstruct] && typeof obj.constructor.prototype[postConstruct] === 'function')
-                    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 */
+            catch (e) {
+                return state_1.State.MakeState(null, e, undefined);
             }
-            if (pcFn) {
-                let result;
+        }
+        if (paramStates.some(p => p.pending)) {
+            // One or more params require async resolution — wait for them, then invoke.
+            const paramsPromise = Promise.all(paramStates.map(async (p, idx) => {
+                if (p.pending) {
+                    try {
+                        return await p.promise;
+                    }
+                    catch (err) {
+                        const md = (0, decorators_1._getOptionalDefaultForMethod)(ctor.prototype, pcMethodName, idx);
+                        if (!md)
+                            throw err;
+                        return md.value;
+                    }
+                }
+                return p.fulfilled;
+            }));
+            return state_1.State.MakeState((async () => {
+                let args;
                 try {
-                    result = pcFn();
+                    args = await paramsPromise;
                 }
                 catch (err) {
-                    // The post construction method threw while executing, give the errorHandler (if any) a crack at recovery.
-                    try {
-                        obj = this.queryErrorHandler(err, obj); // The returned obj is unlikely to be the original obj.
-                        return state_js_1.State.MakeState(null, undefined, obj);
-                    }
-                    catch (e) {
-                        // could not recover, propagate the error.
-                        return state_js_1.State.MakeState(null, e, undefined);
+                    return this.queryErrorHandler(err, obj);
+                }
+                try {
+                    const pcResult = obj[pcMethodName](...args);
+                    if (pcResult && (pcResult instanceof Promise || (pcMaybeAsync && (0, utils_1.isPromise)(pcResult))))
+                        await pcResult;
+                    if (hasSuccess) {
+                        const sResult = this.successHandler(obj, this.injector, this.id, this.maker);
+                        if (sResult && (0, utils_1.isPromise)(sResult))
+                            await sResult;
                     }
+                    return obj;
+                }
+                catch (err) {
+                    return this.queryErrorHandler(err, obj);
                 }
-                // The post construction method says it will let us know when it's finished.
-                if (result && (result instanceof Promise || (maybeAsync && (0, utils_js_1.isPromise)(result)))) {
-                    // Return a State that is pending (the other return statements in this method return a State which is resolved or rejected).
-                    /* eslint-disable @typescript-eslint/no-unsafe-argument */
-                    return state_js_1.State.MakeState(this.makePromiseForObj(result, () => obj));
+            })());
+        }
+        // All params are synchronously available (or there are no params).
+        const pcArgs = paramStates.map(p => p.fulfilled);
+        const maybeAsync = pcMaybeAsync || hasSuccess;
+        // Build a single function that calls PostConstruct (with resolved args) then onSuccess.
+        let pcFn;
+        if (pcValid) {
+            pcFn = () => {
+                const pcResult = obj[pcMethodName](...pcArgs);
+                if (pcResult && (pcResult instanceof Promise || (pcMaybeAsync && (0, utils_1.isPromise)(pcResult)))) {
+                    // PostConstruct is async — chain onSuccess after it resolves.
+                    return hasSuccess
+                        ? pcResult.then(() => this.successHandler(obj, this.injector, this.id, this.maker))
+                        : pcResult;
                 }
+                // PostConstruct is sync — call onSuccess immediately.
+                if (hasSuccess)
+                    return this.successHandler(obj, this.injector, this.id, this.maker);
+                return pcResult;
+            };
+        }
+        else {
+            // No PostConstruct — just call onSuccess.
+            pcFn = () => this.successHandler(obj, this.injector, this.id, this.maker);
+        }
+        let result;
+        try {
+            result = pcFn();
+        }
+        catch (err) {
+            try {
+                obj = this.queryErrorHandler(err, obj);
+                return state_1.State.MakeState(null, undefined, obj);
+            }
+            catch (e) {
+                return state_1.State.MakeState(null, e, undefined);
             }
         }
-        // No PostConstruct, just return a resolved State
-        return state_js_1.State.MakeState(null, undefined, obj);
+        if (result && (result instanceof Promise || (maybeAsync && (0, utils_1.isPromise)(result)))) {
+            return state_1.State.MakeState(this.makePromiseForObj(result, () => obj));
+        }
+        return state_1.State.MakeState(null, undefined, obj);
+    }
+    /**
+     * Collects the resolved States for all injectable parameters of a @PostConstruct method.
+     * Uses the same resolution rules as constructor parameters: the reflected type (or an explicit @Inject token) is used to look up the binding, and an error is thrown if the type cannot be determined.
+     * Use @Optional() on a parameter to supply a fallback when no binding is found.
+     * Returns an empty array if the method has no parameters.
+     */
+    getMethodParameterStates(ctor, methodName) {
+        const argTypes = Reflect.getMetadata(constants_1.REFLECT_PARAMS, ctor.prototype, methodName);
+        if (!Array.isArray(argTypes) || argTypes.length === 0)
+            return [];
+        return argTypes.map((argType, index) => {
+            const overrideToken = (0, decorators_1._getInjectedIdForMethod)(ctor.prototype, methodName, index);
+            const actualToken = overrideToken !== undefined ? overrideToken : argType;
+            if (actualToken == null) {
+                throw new Error(`Injection error. Unable to determine parameter ${index} type/value of ${ctor.name}.${methodName}`);
+            }
+            let param = this.injector.resolveState(actualToken);
+            if (!param.pending && param.rejected) {
+                const optionalDefault = (0, decorators_1._getOptionalDefaultForMethod)(ctor.prototype, methodName, index);
+                if (optionalDefault)
+                    param = state_1.State.MakeState(null, undefined, optionalDefault.value);
+            }
+            return param;
+        });
     }
     /**
      * This method collects the States of all the constructor parameters for our target class.
      */
     getConstructorParameterStates() {
-        const argTypes = Reflect.getMetadata(constants_js_1.REFLECT_PARAMS, this.maker);
+        const argTypes = Reflect.getMetadata(constants_1.REFLECT_PARAMS, this.maker);
         if (argTypes === undefined || !Array.isArray(argTypes)) {
             return [];
         }
@@ -102,7 +203,7 @@ class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
             // The reflect-metadata API fails on circular dependencies returning undefined instead.
             // Additionally, it cannot return generic types (no runtime type info).
             // If an Inject annotation precedes the parameter, then that is what should get injected.
-            const overrideToken = (0, decorators_js_1._getInjectedIdAt)(this.maker, index);
+            const overrideToken = (0, decorators_1._getInjectedIdAt)(this.maker, index);
             // If there was no Inject annotation, we might still be able to determine what to inject using the 'argType' (aka Reflect design:paramtypes).
             const actualToken = overrideToken === undefined ? argType : overrideToken;
             if (actualToken === undefined) {
@@ -110,13 +211,12 @@ class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
                 throw new Error(`Injection error. Unable to determine parameter ${index} type/value of ${this.maker.toString()} constructor`);
             }
             // Ask our container to resolve the parameter.
-            /* eslint-disable @typescript-eslint/no-unsafe-argument */
             let param = this.injector.resolveState(actualToken);
             // If the parameter could not be resolved, see if there is an @Optional annotation
             if ((!param.pending) && param.rejected) {
-                const md = (0, decorators_js_1._getOptionalDefaultAt)(this.maker, index);
+                const md = (0, decorators_1._getOptionalDefaultAt)(this.maker, index);
                 if (md)
-                    param = state_js_1.State.MakeState(null, undefined, md.value);
+                    param = state_1.State.MakeState(null, undefined, md.value);
             }
             return param;
         });
@@ -137,41 +237,43 @@ class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
             // We do this by mapping each param to a Promise (pending or not), and then awaiting them all.
             // This might create some unnecessary (but immediately resolved) Promise objects,
             // BUT, it allows us to chain for failure *and* substitute the Optional (if one exists).
-            const objPromise = this.makePromiseForObj(Promise.all(params.map((p, idx) => {
+            const objPromise = this.makePromiseForObj(Promise.all(params.map(async (p, idx) => {
                 if (p.pending) {
-                    return p.promise.catch(err => {
+                    try {
+                        return await p.promise;
+                    }
+                    catch (err) {
                         // This was a promised param that failed to resolve.
                         // If there is an Optional decorator, use that, otherwise, failure is failure.
-                        const md = (0, decorators_js_1._getOptionalDefaultAt)(this.maker, idx);
+                        const md = (0, decorators_1._getOptionalDefaultAt)(this.maker, idx);
                         if (!md)
                             throw err;
                         return md.value;
-                    });
+                    }
                 }
-                if (p.rejected)
-                    return Promise.reject(p.rejected);
-                return Promise.resolve(p.fulfilled);
+                return p.fulfilled;
             })), (values) => {
                 if (values) {
                     // All the parameters are now available, instantiate the class.
                     // If this throws, it will be handled by our caller.
                     return Reflect.construct(this.maker, values);
                 }
+                return undefined;
             });
             // Once the obj is resolved, then we need to check for PostConstruct and if it was async, wait for that too.
-            return state_js_1.State.MakeState(objPromise.then((obj) => {
+            return state_1.State.MakeState((async () => {
+                const obj = await objPromise;
                 const state = this.makePostConstructState(obj);
                 if (state.pending) {
-                    return state.promise; // chain (aka wait some more).
+                    return await state.promise; // chain (aka wait some more).
                 }
                 else if (state.rejected) {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                    return state.rejected; // error
+                    throw state.rejected; // error
                 }
                 else {
                     return state.fulfilled; // value (aka obj).
                 }
-            }));
+            })());
         }
         else {
             // All parameters needed for construction are available, instantiate the object.
@@ -182,11 +284,11 @@ class ClassBasedProvider extends bindable_provider_js_1.BindableProvider {
             catch (err) {
                 // There was an error, give the errorHandler (if any) a crack at recovery.
                 try {
-                    return state_js_1.State.MakeState(null, undefined, this.queryErrorHandler(err));
+                    return state_1.State.MakeState(null, undefined, this.queryErrorHandler(err));
                 }
                 catch (e) {
                     // could not recover, propagate the error.
-                    return state_js_1.State.MakeState(null, e, undefined);
+                    return state_1.State.MakeState(null, e, undefined);
                 }
             }
         }

package/lib/cjs/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.js';\nimport {POSTCONSTRUCT_ASYNC_METADATA_KEY, POSTCONSTRUCT_SYNC_METADATA_KEY, REFLECT_PARAMS} from './constants.js';\nimport {_getInjectedIdAt, _getOptionalDefaultAt} from './decorators.js';\nimport {ClassConstructor, InjectableId, Injector} from './injector.js';\nimport {State} from './state.js';\nimport {isPromise} from './utils.js';\n\n/*\n * This is a bit of a hack, but it avoids a ton of alternative hacks.\n * Note that in the Container, resolveState is a protected method.\n * Injector was never meant to publicly expose State.\n * Gotta love JS!\n */\ninterface StateResolvingInjector extends Injector {\n\tresolveState<T>(id: InjectableId<T>): State<T>;\n}\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: StateResolvingInjector, id: InjectableId<T>, maker: ClassConstructor<T>) {\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}\n\t\t\telse {\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\t/* eslint-disable @typescript-eslint/no-unsafe-argument */\n\t\t\t\t\treturn State.MakeState<T>(this.makePromiseForObj<T>(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 returning undefined instead.\n\t\t\t// Additionally, it cannot return generic types (no runtime type info).\n\t\t\t// If an Inject annotation precedes the parameter, then that is what should get injected.\n\t\t\tconst overrideToken = _getInjectedIdAt(this.maker, index);\n\t\t\t// If there was no Inject annotation, we might still be able to determine what to inject using the 'argType' (aka Reflect design:paramtypes).\n\t\t\tconst actualToken = overrideToken === undefined ? argType : overrideToken;\n\t\t\tif (actualToken === undefined) {\n\t\t\t\t// No Inject annotation, and the type is not known.\n\t\t\t\tthrow new Error(`Injection error. Unable to determine parameter ${index} type/value of ${this.maker.toString()} constructor`);\n\t\t\t}\n\t\t\t// Ask our container to resolve the parameter.\n\t\t\t/* eslint-disable @typescript-eslint/no-unsafe-argument */\n\t\t\tlet param = (this.injector as StateResolvingInjector).resolveState(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 firstRejectedParam = params.find((p) => {\n\t\t\treturn (!p.pending) && p.rejected;\n\t\t});\n\t\tif (firstRejectedParam)\n\t\t\treturn firstRejectedParam as State<T>;\n\t\tif (params.some(p => p.pending)) {\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\t// We do this by mapping each param to a Promise (pending or not), and then awaiting them all.\n\t\t\t// This might create some unnecessary (but immediately resolved) Promise objects,\n\t\t\t// BUT, it allows us to chain for failure *and* substitute the Optional (if one exists).\n\t\t\tconst objPromise = this.makePromiseForObj<any[]>(Promise.all(params.map((p, idx) => {\n\t\t\t\tif (p.pending) {\n\t\t\t\t\treturn p.promise.catch(err => {\n\t\t\t\t\t\t// This was a promised param that failed to resolve.\n\t\t\t\t\t\t// If there is an Optional decorator, use that, otherwise, failure is failure.\n\t\t\t\t\t\tconst md = _getOptionalDefaultAt(this.maker, idx);\n\t\t\t\t\t\tif (!md)\n\t\t\t\t\t\t\tthrow err;\n\t\t\t\t\t\treturn md.value as unknown;\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t\tif (p.rejected)\n\t\t\t\t\treturn Promise.reject(p.rejected);\n\t\t\t\treturn Promise.resolve(p.fulfilled);\n\t\t\t})), (values) => {\n\t\t\t\tif (values) {\n\t\t\t\t\t// All the parameters are now available, instantiate the class.\n\t\t\t\t\t// If this throws, it will be handled by our caller.\n\t\t\t\t\treturn Reflect.construct(this.maker, values);\n\t\t\t\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"]}
+{"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, _getInjectedIdForMethod, _getOptionalDefaultAt, _getOptionalDefaultForMethod} from './decorators';\nimport {ClassConstructor, InjectableId, Injector} from './injector';\nimport {State} from './state';\nimport {isPromise} from './utils';\n\n/*\n * This is a bit of a hack, but it avoids a ton of alternative hacks.\n * Note that in the Container, resolveState is a protected method.\n * Injector was never meant to publicly expose State.\n * Gotta love JS!\n */\ninterface StateResolvingInjector extends Injector {\n\tresolveState<T>(id: InjectableId<T>): State<T>;\n}\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: StateResolvingInjector, id: InjectableId<T>, maker: ClassConstructor<T>) {\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 * **unless** the @PostConstruct method has injectable parameters, which may themselves require async resolution.\n\t */\n\tresolveIfSingleton(asyncOnly: boolean): Promise<T> | undefined {\n\t\tif (!asyncOnly || Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker) || this.postConstructHasParams())\n\t\t\treturn super.resolveIfSingleton(false);\n\t\treturn undefined;\n\t}\n\n\t/**\n\t * Returns true if the @PostConstruct method (if any) has at least one parameter.\n\t * Any parameter may require async resolution, so this class must participate in resolveSingletons.\n\t */\n\tprivate postConstructHasParams(): boolean {\n\t\tconst pcMethod =\n\t\t\t(Reflect.getMetadata(POSTCONSTRUCT_SYNC_METADATA_KEY, this.maker) as string | undefined) ??\n\t\t\t(Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, this.maker) as string | undefined);\n\t\tif (!pcMethod)\n\t\t\treturn false;\n\t\tconst paramTypes = Reflect.getMetadata(REFLECT_PARAMS, this.maker.prototype, pcMethod) as unknown[] | undefined;\n\t\treturn Array.isArray(paramTypes) && paramTypes.length > 0;\n\t}\n\n\t/**\n\t * Make a resolved or pending State that reflects any @PostConstruct annotations and/or onSuccess handler.\n\t * Any @PostConstruct method (with any injected parameters) runs first; the onSuccess handler runs after.\n\t */\n\tprotected makePostConstructState(obj: T): State<T> {\n\t\tif (obj === null || typeof obj !== 'object' || Array.isArray(obj) || !(obj as any).constructor) {\n\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t}\n\t\tconst ctor = (obj as any).constructor;\n\n\t\t// Look up the @PostConstruct method name (sync or async).\n\t\tlet pcMaybeAsync = false;\n\t\tlet pcMethodName: string | undefined = Reflect.getMetadata(POSTCONSTRUCT_SYNC_METADATA_KEY, ctor) as string | undefined;\n\t\tif (!pcMethodName) {\n\t\t\tpcMethodName = Reflect.getMetadata(POSTCONSTRUCT_ASYNC_METADATA_KEY, ctor) as string | undefined;\n\t\t\tpcMaybeAsync = !!pcMethodName;\n\t\t}\n\t\tconst pcValid = !!(pcMethodName && typeof ctor.prototype[pcMethodName] === 'function');\n\t\tconst hasSuccess = typeof this.successHandler === 'function';\n\n\t\tif (!pcValid && !hasSuccess) {\n\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t}\n\n\t\t// Resolve any injectable parameters declared on the @PostConstruct method.\n\t\tconst paramStates = pcValid ? this.getMethodParameterStates(ctor, pcMethodName!) : [];\n\n\t\t// A synchronously rejected param (with no @Optional fallback) is treated as a PostConstruct error.\n\t\tconst firstRejected = paramStates.find(p => !p.pending && p.rejected);\n\t\tif (firstRejected) {\n\t\t\ttry {\n\t\t\t\tobj = this.queryErrorHandler(firstRejected.rejected, obj);\n\t\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t\t}\n\t\t\tcatch (e) {\n\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t}\n\t\t}\n\n\t\tif (paramStates.some(p => p.pending)) {\n\t\t\t// One or more params require async resolution — wait for them, then invoke.\n\t\t\tconst paramsPromise = Promise.all(paramStates.map(async (p, idx) => {\n\t\t\t\tif (p.pending) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\treturn await p.promise!;\n\t\t\t\t\t}\n\t\t\t\t\tcatch (err) {\n\t\t\t\t\t\tconst md = _getOptionalDefaultForMethod(ctor.prototype, pcMethodName!, idx);\n\t\t\t\t\t\tif (!md) throw err;\n\t\t\t\t\t\treturn md.value;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn p.fulfilled;\n\t\t\t}));\n\t\t\treturn State.MakeState<T>((async () => {\n\t\t\t\tlet args: any[];\n\t\t\t\ttry {\n\t\t\t\t\targs = await paramsPromise;\n\t\t\t\t}\n\t\t\t\tcatch (err) {\n\t\t\t\t\treturn this.queryErrorHandler(err, obj);\n\t\t\t\t}\n\t\t\t\ttry {\n\t\t\t\t\tconst pcResult = (obj as any)[pcMethodName!](...args);\n\t\t\t\t\tif (pcResult && (pcResult instanceof Promise || (pcMaybeAsync && isPromise(pcResult))))\n\t\t\t\t\t\tawait pcResult;\n\t\t\t\t\tif (hasSuccess) {\n\t\t\t\t\t\tconst sResult = this.successHandler!(obj, this.injector, this.id, this.maker);\n\t\t\t\t\t\tif (sResult && isPromise(sResult)) await sResult;\n\t\t\t\t\t}\n\t\t\t\t\treturn obj;\n\t\t\t\t}\n\t\t\t\tcatch (err) {\n\t\t\t\t\treturn this.queryErrorHandler(err, obj);\n\t\t\t\t}\n\t\t\t})());\n\t\t}\n\n\t\t// All params are synchronously available (or there are no params).\n\t\tconst pcArgs = paramStates.map(p => p.fulfilled);\n\t\tconst maybeAsync = pcMaybeAsync || hasSuccess;\n\n\t\t// Build a single function that calls PostConstruct (with resolved args) then onSuccess.\n\t\tlet pcFn: (() => void | Error | Promise<void | Error>) | undefined;\n\t\tif (pcValid) {\n\t\t\tpcFn = () => {\n\t\t\t\tconst pcResult = (obj as any)[pcMethodName!](...pcArgs);\n\t\t\t\tif (pcResult && (pcResult instanceof Promise || (pcMaybeAsync && isPromise<void>(pcResult)))) {\n\t\t\t\t\t// PostConstruct is async — chain onSuccess after it resolves.\n\t\t\t\t\treturn hasSuccess\n\t\t\t\t\t\t? (pcResult as Promise<void>).then(() => this.successHandler!(obj, this.injector, this.id, this.maker))\n\t\t\t\t\t\t: pcResult as Promise<void>;\n\t\t\t\t}\n\t\t\t\t// PostConstruct is sync — call onSuccess immediately.\n\t\t\t\tif (hasSuccess)\n\t\t\t\t\treturn this.successHandler!(obj, this.injector, this.id, this.maker) as void | Error | Promise<void | Error>;\n\t\t\t\treturn pcResult;\n\t\t\t};\n\t\t}\n\t\telse {\n\t\t\t// No PostConstruct — just call onSuccess.\n\t\t\tpcFn = () => this.successHandler!(obj, this.injector, this.id, this.maker) as void | Error | Promise<void | Error>;\n\t\t}\n\n\t\tlet result: any;\n\t\ttry {\n\t\t\tresult = pcFn();\n\t\t}\n\t\tcatch (err) {\n\t\t\ttry {\n\t\t\t\tobj = this.queryErrorHandler(err, obj);\n\t\t\t\treturn State.MakeState<T>(null, undefined, obj);\n\t\t\t}\n\t\t\tcatch (e) {\n\t\t\t\treturn State.MakeState<T>(null, e, undefined);\n\t\t\t}\n\t\t}\n\t\tif (result && (result instanceof Promise || (maybeAsync && isPromise<void>(result)))) {\n\t\t\treturn State.MakeState<T>(this.makePromiseForObj<T>(result, () => obj));\n\t\t}\n\t\treturn State.MakeState<T>(null, undefined, obj);\n\t}\n\n\t/**\n\t * Collects the resolved States for all injectable parameters of a @PostConstruct method.\n\t * Uses the same resolution rules as constructor parameters: the reflected type (or an explicit @Inject token) is used to look up the binding, and an error is thrown if the type cannot be determined.\n\t * Use @Optional() on a parameter to supply a fallback when no binding is found.\n\t * Returns an empty array if the method has no parameters.\n\t */\n\tprotected getMethodParameterStates(ctor: Function, methodName: string): State[] {\n\t\tconst argTypes = Reflect.getMetadata(REFLECT_PARAMS, ctor.prototype, methodName) as unknown[] | undefined;\n\t\tif (!Array.isArray(argTypes) || argTypes.length === 0)\n\t\t\treturn [];\n\t\treturn argTypes.map((argType, index) => {\n\t\t\tconst overrideToken = _getInjectedIdForMethod(ctor.prototype, methodName, index);\n\t\t\tconst actualToken = overrideToken !== undefined ? overrideToken : argType;\n\t\t\tif (actualToken == null) {\n\t\t\t\tthrow new Error(`Injection error. Unable to determine parameter ${index} type/value of ${(ctor as any).name}.${methodName}`);\n\t\t\t}\n\t\t\tlet param = (this.injector as StateResolvingInjector).resolveState(actualToken as InjectableId<unknown>);\n\t\t\tif (!param.pending && param.rejected) {\n\t\t\t\tconst optionalDefault = _getOptionalDefaultForMethod(ctor.prototype, methodName, index);\n\t\t\t\tif (optionalDefault)\n\t\t\t\t\tparam = State.MakeState<any>(null, undefined, optionalDefault.value);\n\t\t\t}\n\t\t\treturn param;\n\t\t});\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 returning undefined instead.\n\t\t\t// Additionally, it cannot return generic types (no runtime type info).\n\t\t\t// If an Inject annotation precedes the parameter, then that is what should get injected.\n\t\t\tconst overrideToken = _getInjectedIdAt(this.maker, index);\n\t\t\t// If there was no Inject annotation, we might still be able to determine what to inject using the 'argType' (aka Reflect design:paramtypes).\n\t\t\tconst actualToken = overrideToken === undefined ? argType : overrideToken;\n\t\t\tif (actualToken === undefined) {\n\t\t\t\t// No Inject annotation, and the type is not known.\n\t\t\t\tthrow new Error(`Injection error. Unable to determine parameter ${index} type/value of ${this.maker.toString()} constructor`);\n\t\t\t}\n\t\t\t// Ask our container to resolve the parameter.\n\t\t\tlet param = (this.injector as StateResolvingInjector).resolveState(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 firstRejectedParam = params.find((p) => {\n\t\t\treturn (!p.pending) && p.rejected;\n\t\t});\n\t\tif (firstRejectedParam)\n\t\t\treturn firstRejectedParam as State<T>;\n\t\tif (params.some(p => p.pending)) {\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\t// We do this by mapping each param to a Promise (pending or not), and then awaiting them all.\n\t\t\t// This might create some unnecessary (but immediately resolved) Promise objects,\n\t\t\t// BUT, it allows us to chain for failure *and* substitute the Optional (if one exists).\n\t\t\tconst objPromise = this.makePromiseForObj<any[]>(Promise.all(params.map(async (p, idx) => {\n\t\t\t\tif (p.pending) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\treturn await p.promise!;\n\t\t\t\t\t}\n\t\t\t\t\tcatch (err) {\n\t\t\t\t\t\t// This was a promised param that failed to resolve.\n\t\t\t\t\t\t// If there is an Optional decorator, use that, otherwise, failure is failure.\n\t\t\t\t\t\tconst md = _getOptionalDefaultAt(this.maker, idx);\n\t\t\t\t\t\tif (!md)\n\t\t\t\t\t\t\tthrow err;\n\t\t\t\t\t\treturn md.value as unknown;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn p.fulfilled;\n\t\t\t})), (values) => {\n\t\t\t\tif (values) {\n\t\t\t\t\t// All the parameters are now available, instantiate the class.\n\t\t\t\t\t// If this throws, it will be handled by our caller.\n\t\t\t\t\treturn Reflect.construct(this.maker, values);\n\t\t\t\t}\n\t\t\t\treturn undefined 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>((async () => {\n\t\t\t\tconst obj = await objPromise;\n\t\t\t\tconst state = this.makePostConstructState(obj);\n\t\t\t\tif (state.pending) {\n\t\t\t\t\treturn await 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\tthrow 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\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/cjs/constant-provider.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstantProvider = void 0;
-const provider_js_1 = require("./provider.js");
-const state_js_1 = require("./state.js");
+const provider_1 = require("./provider");
+const state_1 = require("./state");
 /**
  * @inheritDoc
  * This specialization is always a Singleton.
  */
-class ConstantProvider extends provider_js_1.Provider {
+class ConstantProvider extends provider_1.Provider {
     constructor(constant) {
         super();
-        this.singleton = state_js_1.State.MakeState(null, undefined, constant);
+        this.singleton = state_1.State.MakeState(null, undefined, constant);
     }
     provideAsState() {
         return this.singleton;

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

@@ -1 +1 @@
-{"version":3,"file":"constant-provider.js","sourceRoot":"","sources":["../../src/constant-provider.ts"],"names":[],"mappings":";;;AAAA,+CAAuC;AACvC,yCAAiC;AAEjC;;;GAGG;AACH,MAAa,gBAAoB,SAAQ,sBAAW;IACnD,YAAY,QAAW;QACtB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,gBAAK,CAAC,SAAS,CAAI,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;CACD;AATD,4CASC","sourcesContent":["import {Provider} from './provider.js';\nimport {State} from './state.js';\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,yCAAoC;AACpC,mCAA8B;AAE9B;;;GAGG;AACH,MAAa,gBAAoB,SAAQ,mBAAW;IACnD,YAAY,QAAW;QACtB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,aAAK,CAAC,SAAS,CAAI,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,SAAU,CAAC;IACxB,CAAC;CACD;AATD,4CASC","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"]}