ts-ioc-container 27.3.0 → 27.4.0

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.ReflectionInjector = exports.Registration = exports.key = exports.AutoMockedContainer = exports.TaggedProvider = exports.tags = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.RegistrationConflictError = exports.DependencyNotFoundError = exports.alias = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.ReflectionInjector = exports.Registration = exports.key = exports.AutoMockedContainer = exports.TaggedProvider = exports.tags = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.alias = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -11,8 +11,6 @@ var IProvider_1 = require("./provider/IProvider");
 Object.defineProperty(exports, "alias", { enumerable: true, get: function () { return IProvider_1.alias; } });
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
-var RegistrationConflictError_1 = require("./errors/RegistrationConflictError");
-Object.defineProperty(exports, "RegistrationConflictError", { enumerable: true, get: function () { return RegistrationConflictError_1.RegistrationConflictError; } });
 var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
 var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
@@ -32,7 +30,7 @@ Object.defineProperty(exports, "tags", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "TaggedProvider", { enumerable: true, get: function () { return TaggedProvider_1.TaggedProvider; } });
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
-var Registration_1 = require("./registration/Registration");
+var Registration_1 = require("./provider/Registration");
 Object.defineProperty(exports, "key", { enumerable: true, get: function () { return Registration_1.key; } });
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
 var ReflectionInjector_1 = require("./injector/ReflectionInjector");

package/cjm/{registration → provider}/Registration.js

@@ -2,35 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Registration = exports.key = void 0;
 const metadata_1 = require("../metadata");
-const Provider_1 = require("../provider/Provider");
-const ThrowErrorIfNoDependency_1 = require("./ThrowErrorIfNoDependency");
+const Provider_1 = require("./Provider");
+const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
 const DEPENDENCY_KEY = 'DependencyKey';
 const key = (value) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, value);
 exports.key = key;
 class Registration {
-    constructor(key, provider) {
-        this.key = key;
+    constructor(provider, key) {
         this.provider = provider;
+        this.key = key;
     }
     static fromClass(Target) {
         const dependencyKey = (0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY);
-        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider_1.Provider.fromClass(Target));
+        return new Registration(Provider_1.Provider.fromClass(Target), dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name);
     }
-    getKey() {
-        return this.key;
+    static fromValue(value) {
+        return new Registration(Provider_1.Provider.fromValue(value));
+    }
+    static fromFn(fn) {
+        return new Registration(new Provider_1.Provider(fn));
     }
     to(key) {
         this.key = key;
         return this;
     }
-    throwErrorOnConflict() {
-        return new ThrowErrorIfNoDependency_1.ThrowErrorIfNoDependency(this);
-    }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);
         return this;
     }
     applyTo(container) {
+        if (!this.key) {
+            throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
+        }
         container.register(this.key, this.provider);
     }
 }

package/esm/index.js

@@ -3,7 +3,6 @@ export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { alias } from './provider/IProvider';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
-export { RegistrationConflictError } from './errors/RegistrationConflictError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
@@ -11,7 +10,7 @@ export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { tags, TaggedProvider } from './provider/TaggedProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './registration/Registration';
+export { key, Registration } from './provider/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/esm/{registration → provider}/Registration.js

@@ -1,32 +1,35 @@
 import { getMetadata, setMetadata } from '../metadata';
-import { Provider } from '../provider/Provider';
-import { ThrowErrorIfNoDependency } from './ThrowErrorIfNoDependency';
+import { Provider } from './Provider';
+import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 const DEPENDENCY_KEY = 'DependencyKey';
 export const key = (value) => setMetadata(DEPENDENCY_KEY, value);
 export class Registration {
-    constructor(key, provider) {
-        this.key = key;
+    constructor(provider, key) {
         this.provider = provider;
+        this.key = key;
     }
     static fromClass(Target) {
         const dependencyKey = getMetadata(Target, DEPENDENCY_KEY);
-        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider.fromClass(Target));
+        return new Registration(Provider.fromClass(Target), dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name);
     }
-    getKey() {
-        return this.key;
+    static fromValue(value) {
+        return new Registration(Provider.fromValue(value));
+    }
+    static fromFn(fn) {
+        return new Registration(new Provider(fn));
     }
     to(key) {
         this.key = key;
         return this;
     }
-    throwErrorOnConflict() {
-        return new ThrowErrorIfNoDependency(this);
-    }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);
         return this;
     }
     applyTo(container) {
+        if (!this.key) {
+            throw new DependencyMissingKeyError('No key provided for registration');
+        }
         container.register(this.key, this.provider);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "27.3.0",
+  "version": "27.4.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -60,5 +60,5 @@
     "ts-node": "^10.9.1",
     "typescript": "4.4.3"
   },
-  "gitHead": "68462d7b245697342b3250124d4a668c6641fccf"
+  "gitHead": "917c4879c7452ab78bb70482479e963e451361a3"
 }

package/typings/index.d.ts

@@ -5,7 +5,6 @@ export { EmptyContainer } from './container/EmptyContainer';
 export { ResolveDependency, IProvider, alias } from './provider/IProvider';
 export { IInjector } from './injector/IInjector';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
-export { RegistrationConflictError } from './errors/RegistrationConflictError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
@@ -13,7 +12,7 @@ export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { tags, TaggedProvider } from './provider/TaggedProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './registration/Registration';
+export { key, Registration } from './provider/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/typings/provider/Registration.d.ts

@@ -0,0 +1,15 @@
+import { DependencyKey, IContainer } from '../container/IContainer';
+import { constructor, MapFn } from '../utils';
+import { IProvider, ResolveDependency } from './IProvider';
+export declare const key: (value: DependencyKey) => ClassDecorator;
+export declare class Registration<T> {
+    private provider;
+    private key?;
+    static fromClass<T>(Target: constructor<T>): Registration<T>;
+    static fromValue<T>(value: T): Registration<T>;
+    static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
+    constructor(provider: IProvider<T>, key?: DependencyKey | undefined);
+    to(key: DependencyKey): this;
+    pipe(...mappers: MapFn<IProvider<T>>[]): this;
+    applyTo(container: IContainer): void;
+}

package/cjm/errors/RegistrationConflictError.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistrationConflictError = void 0;
-class RegistrationConflictError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'RegistrationConflictError';
-        Object.setPrototypeOf(this, RegistrationConflictError.prototype);
-    }
-    static assert(isTrue, failMessage) {
-        if (!isTrue) {
-            throw new RegistrationConflictError(failMessage);
-        }
-    }
-}
-exports.RegistrationConflictError = RegistrationConflictError;

package/cjm/registration/IRegistration.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistrationDecorator = void 0;
-class RegistrationDecorator {
-    constructor(decorated) {
-        this.decorated = decorated;
-    }
-    getKey() {
-        return this.decorated.getKey();
-    }
-    to(key) {
-        this.decorated.to(key);
-        return this;
-    }
-    pipe(...mappers) {
-        this.decorated.pipe(...mappers);
-        return this;
-    }
-    applyTo(container) {
-        this.decorated.applyTo(container);
-    }
-}
-exports.RegistrationDecorator = RegistrationDecorator;

package/cjm/registration/ThrowErrorIfNoDependency.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThrowErrorIfNoDependency = void 0;
-const RegistrationConflictError_1 = require("../errors/RegistrationConflictError");
-const IRegistration_1 = require("./IRegistration");
-class ThrowErrorIfNoDependency extends IRegistration_1.RegistrationDecorator {
-    constructor(module) {
-        super(module);
-        this.module = module;
-    }
-    applyTo(c) {
-        const key = this.module.getKey();
-        RegistrationConflictError_1.RegistrationConflictError.assert(!c.hasDependency(key), `Provider for key ${key.toString()} is already registered`);
-        this.module.applyTo(c);
-    }
-}
-exports.ThrowErrorIfNoDependency = ThrowErrorIfNoDependency;

package/esm/errors/RegistrationConflictError.js

@@ -1,12 +0,0 @@
-export class RegistrationConflictError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'RegistrationConflictError';
-        Object.setPrototypeOf(this, RegistrationConflictError.prototype);
-    }
-    static assert(isTrue, failMessage) {
-        if (!isTrue) {
-            throw new RegistrationConflictError(failMessage);
-        }
-    }
-}

package/esm/registration/IRegistration.js

@@ -1,19 +0,0 @@
-export class RegistrationDecorator {
-    constructor(decorated) {
-        this.decorated = decorated;
-    }
-    getKey() {
-        return this.decorated.getKey();
-    }
-    to(key) {
-        this.decorated.to(key);
-        return this;
-    }
-    pipe(...mappers) {
-        this.decorated.pipe(...mappers);
-        return this;
-    }
-    applyTo(container) {
-        this.decorated.applyTo(container);
-    }
-}

package/esm/registration/ThrowErrorIfNoDependency.js

@@ -1,13 +0,0 @@
-import { RegistrationConflictError } from '../errors/RegistrationConflictError';
-import { RegistrationDecorator } from './IRegistration';
-export class ThrowErrorIfNoDependency extends RegistrationDecorator {
-    constructor(module) {
-        super(module);
-        this.module = module;
-    }
-    applyTo(c) {
-        const key = this.module.getKey();
-        RegistrationConflictError.assert(!c.hasDependency(key), `Provider for key ${key.toString()} is already registered`);
-        this.module.applyTo(c);
-    }
-}

package/typings/errors/RegistrationConflictError.d.ts

@@ -1,5 +0,0 @@
-export declare class RegistrationConflictError extends Error {
-    static assert(isTrue: boolean, failMessage: string): void;
-    name: string;
-    constructor(message: string);
-}

package/typings/registration/IRegistration.d.ts

@@ -1,16 +0,0 @@
-import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
-import { MapFn } from '../utils';
-import { IProvider } from '../provider/IProvider';
-export interface IRegistration extends IContainerModule {
-    getKey(): DependencyKey;
-    to(key: DependencyKey): this;
-    pipe(...mappers: MapFn<IProvider>[]): this;
-}
-export declare abstract class RegistrationDecorator implements IRegistration {
-    private decorated;
-    constructor(decorated: IRegistration);
-    getKey(): DependencyKey;
-    to(key: DependencyKey): this;
-    pipe(...mappers: MapFn<IProvider>[]): this;
-    applyTo(container: IContainer): void;
-}

package/typings/registration/Registration.d.ts

@@ -1,17 +0,0 @@
-import { DependencyKey, IContainer } from '../container/IContainer';
-import { constructor, MapFn } from '../utils';
-import { IProvider } from '../provider/IProvider';
-import { ThrowErrorIfNoDependency } from './ThrowErrorIfNoDependency';
-import { IRegistration } from './IRegistration';
-export declare const key: (value: DependencyKey) => ClassDecorator;
-export declare class Registration implements IRegistration {
-    private key;
-    private provider;
-    static fromClass(Target: constructor<unknown>): Registration;
-    constructor(key: DependencyKey, provider: IProvider);
-    getKey(): DependencyKey;
-    to(key: DependencyKey): this;
-    throwErrorOnConflict(): ThrowErrorIfNoDependency;
-    pipe(...mappers: MapFn<IProvider>[]): this;
-    applyTo(container: IContainer): void;
-}

package/typings/registration/ThrowErrorIfNoDependency.d.ts

@@ -1,7 +0,0 @@
-import { IContainer } from '../container/IContainer';
-import { IRegistration, RegistrationDecorator } from './IRegistration';
-export declare class ThrowErrorIfNoDependency extends RegistrationDecorator {
-    private module;
-    constructor(module: IRegistration);
-    applyTo(c: IContainer): void;
-}