@artus/injection - npm Package Compare versions

Comparing version 0.0.1 to 0.0.2

lib/container.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
 const types_1 = require("./types");
 const constant_1 = require("./constant");
 const util_1 = require("./util");
+const not_found_1 = require("./error/not_found");
+const no_type_1 = require("./error/no_type");
 class Container {
@@ -13,5 +16,4 @@ constructor(name) {
         const md = this.registry.get(id);
-        // TODO: custom error
         if (!md) {
-            throw new Error('not found');
+            throw new not_found_1.NotFoundError(id);
         }
@@ -21,8 +23,18 @@ return this.getValue(md);
     async getAsync(id) {
-        const instance = this.get(id);
-        await instance.init();
+        var _a;
+        const md = this.registry.get(id);
+        if (!md) {
+            throw new not_found_1.NotFoundError(id);
+        }
+        const instance = this.getValue(md);
+        let methodName = 'init';
+        if (md.type) {
+            const initMd = (0, util_1.getMetadata)(_1.CLASS_ASYNC_INIT_METHOD, md.type);
+            methodName = (initMd === null || initMd === void 0 ? void 0 : initMd.propertyName) || methodName;
+        }
+        await ((_a = instance[methodName]) === null || _a === void 0 ? void 0 : _a.call(instance));
         return instance;
     }
     set(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         let type = options.type;
@@ -39,12 +51,11 @@ if (!type) {
         }
-        // TODO: custom error
         if (!type) {
-            throw new Error('type is required');
+            throw new no_type_1.NoTypeError('type is required');
         }
-        const targetMd = (0, util_1.getMetadata)(constant_1.CLASS_CONSTRUCTOR, options.type);
-        const id = (_c = (_b = options.id) !== null && _b !== void 0 ? _b : targetMd.id) !== null && _c !== void 0 ? _c : options.type;
-        const scope = (_d = options.scope) !== null && _d !== void 0 ? _d : types_1.ScopeEnum.SINGLETON;
-        const args = (0, util_1.getMetadata)(constant_1.CLASS_CONSTRUCTOR_ARGS, options.type);
-        const props = (0, util_1.recursiveGetMetadata)(constant_1.CLASS_PROPERTY, options.type);
-        const md = Object.assign(Object.assign({}, options), { id, scope, constructorArgs: args, properties: props });
+        const targetMd = (0, util_1.getMetadata)(constant_1.CLASS_CONSTRUCTOR, type) || {};
+        const id = (_c = (_b = targetMd.id) !== null && _b !== void 0 ? _b : options.id) !== null && _c !== void 0 ? _c : type;
+        const scope = (_e = (_d = targetMd.scope) !== null && _d !== void 0 ? _d : options.scope) !== null && _e !== void 0 ? _e : types_1.ScopeEnum.SINGLETON;
+        const args = (0, util_1.getMetadata)(constant_1.CLASS_CONSTRUCTOR_ARGS, type);
+        const props = (0, util_1.recursiveGetMetadata)(constant_1.CLASS_PROPERTY, type);
+        const md = Object.assign(Object.assign({}, options), { id, type, scope, constructorArgs: args, properties: props });
         this.registry.set(md.id, md);
@@ -70,3 +81,3 @@ return this;
         if (!args) {
-            args = (_a = (0, util_1.getParamMetadata)(clazz)) !== null && _a !== void 0 ? _a : [].map((ele, index) => ({ id: ele, index }));
+            args = ((_a = (0, util_1.getParamMetadata)(clazz)) !== null && _a !== void 0 ? _a : []).map((ele, index) => ({ id: ele, index }));
         }
@@ -73,0 +84,0 @@ return args.map(arg => {

lib/decorator/init.d.ts

@@ -1,1 +0,1 @@
-export declare function init(): MethodDecorator;
+export declare function Init(): MethodDecorator;

lib/decorator/init.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
-function init() {
-    return (_target, _property, _descriptor) => {
+exports.Init = void 0;
+const util_1 = require("../util");
+const constant_1 = require("../constant");
+function Init() {
+    return (target, property) => {
+        var _a;
+        target = (_a = target.construct) !== null && _a !== void 0 ? _a : target;
+        (0, util_1.setMetadata)(constant_1.CLASS_ASYNC_INIT_METHOD, { id: target, propertyName: property }, target);
     };
 }
-exports.init = init;
+exports.Init = Init;

lib/decorator/inject.d.ts

 import { Identifier } from "..";
-export declare function inject(id?: Identifier): PropertyDecorator | ParameterDecorator;
+export declare function Inject(id?: Identifier): (target: any, propertyKey: string | symbol, index?: number | undefined) => void;

lib/decorator/inject.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inject = void 0;
+exports.Inject = void 0;
 const util_1 = require("../util");
 const constant_1 = require("../constant");
-function inject(id) {
+const cannot_inject_value_1 = require("../error/cannot_inject_value");
+function Inject(id) {
     return (target, propertyKey, index) => {
-        var _a;
-        target = (_a = target.constructor) !== null && _a !== void 0 ? _a : target;
+        if (target.constructor !== Function) {
+            target = target.constructor;
+        }
         let propertyType = id;
@@ -16,7 +18,6 @@ if (!propertyType) {
             const paramTypes = (0, util_1.getParamMetadata)(target);
-            propertyType = paramTypes[index];
+            propertyType = paramTypes === null || paramTypes === void 0 ? void 0 : paramTypes[index];
         }
-        // TODO: custom error
         if (propertyType === undefined || propertyType === Object) {
-            throw new Error('can not inject value');
+            throw new cannot_inject_value_1.CannotInjectValueError(target, propertyKey);
         }
@@ -34,2 +35,2 @@ if (index) {
 }
-exports.inject = inject;
+exports.Inject = Inject;

lib/decorator/injectable.d.ts

@@ -1,2 +0,2 @@
-import { Identifier } from "../types";
-export declare function injectable(id?: Identifier): ClassDecorator;
+import { InjectableOptions } from "../types";
+export declare function Injectable(options?: InjectableOptions): ClassDecorator;

lib/decorator/injectable.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectable = void 0;
+exports.Injectable = void 0;
+const types_1 = require("../types");
 const util_1 = require("../util");
 const constant_1 = require("../constant");
-function injectable(id) {
+function Injectable(options) {
     return (target) => {
-        (0, util_1.setMetadata)(constant_1.CLASS_CONSTRUCTOR, { id: id !== null && id !== void 0 ? id : target.name }, target);
+        var _a;
+        (0, util_1.setMetadata)(constant_1.CLASS_CONSTRUCTOR, { id: (options === null || options === void 0 ? void 0 : options.id) || target, scope: (_a = options === null || options === void 0 ? void 0 : options.scope) !== null && _a !== void 0 ? _a : types_1.ScopeEnum.SINGLETON }, target);
     };
 }
-exports.injectable = injectable;
+exports.Injectable = Injectable;

lib/error/no_type.d.ts

 export declare class NoTypeError extends Error {
+    name: string;
     constructor(message: string);
     get message(): string;
 }

lib/error/no_type.js

@@ -10,5 +10,5 @@ "use strict";
     get message() {
-        return '';
+        return '[@artus/injection] type is required';
     }
 }
 exports.NoTypeError = NoTypeError;

lib/error/not_found.d.ts

@@ -0,4 +1,7 @@
+import { Identifier } from "../types";
 export declare class NotFoundError extends Error {
-    constructor(message: string);
+    name: string;
+    private normalizedIdentifier;
+    constructor(identifier: Identifier);
     get message(): string;
 }

lib/error/not_found.js

@@ -5,10 +5,17 @@ "use strict";
 class NotFoundError extends Error {
-    constructor(message) {
-        super(message);
+    constructor(identifier) {
+        super();
         this.name = 'NotFoundError';
+        this.normalizedIdentifier = 'Unknown';
+        if (typeof identifier === 'string') {
+            this.normalizedIdentifier = identifier;
+        }
+        else if (identifier === null || identifier === void 0 ? void 0 : identifier.name) {
+            this.normalizedIdentifier = identifier.name;
+        }
     }
     get message() {
-        return '';
+        return `[@artus/injection] with "${this.normalizedIdentifier}" identifier was not found in the container. `;
     }
 }
 exports.NotFoundError = NotFoundError;

lib/types.d.ts

@@ -19,4 +19,2 @@ export declare type Constructable<T = unknown> = new (...args: any[]) => T;
     path?: string;
-    filename?: string;
-    filenameWithoutExt?: string;
 }
@@ -26,4 +24,5 @@ export declare type InjectableOptions = Omit<InjectableMetadata, 'properties' | 'constructorArgs'>;
     id: Identifier;
+    scope?: ScopeEnum;
     index?: number;
     propertyName?: string | symbol;
 }

package.json

 {
   "name": "@artus/injection",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "A IoC Implemention for Artus.",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

32843

8.77%

Number of package files

47

4.44%

Lines of code

821

6.76%

No dependency changes