smartdi 0.1.0 → 0.3.0

package/index.d.ts

@@ -1,33 +1,19 @@
 export type Class<T> = {
     new (...args: any[]): T;
 };
-declare const $registry: unique symbol;
+export type AbstractClass<T> = abstract new (...args: any[]) => T;
 export interface InjectableOptions {
     name?: string;
     args?: any[];
     multiple?: boolean;
 }
-interface RegistryItem {
-    name: string;
-    class: Class<any>;
-    args: any[];
-    singleton: boolean;
-    instance: any;
-}
 export declare abstract class SmartDI {
-    static readonly [$registry]: {
-        [key: string]: RegistryItem;
-    };
-    static get<T>(clue: Class<T>, ...args: any[]): T;
+    static register<T>(clazz: Class<T>, options?: InjectableOptions): void;
+    static get<T>(clue: Class<T> | AbstractClass<T>, ...args: any[]): T;
     static get<T>(name: string, ...args: any[]): T;
-    private static internalGet;
-    private static internalGetArray;
-    private static obtainInstance;
-    private static resovleByConstructor;
-    private static resovleOneByConstructor;
+    static getArray<T>(clue: Class<T> | AbstractClass<T>, ...args: any[]): T[];
 }
 export declare function Injectable(options?: InjectableOptions): ClassDecorator;
-export declare function Inject(constructor: Class<any>, ...args: any[]): PropertyDecorator;
+export declare function Inject(constructor: Class<any> | AbstractClass<any>, ...args: any[]): PropertyDecorator;
 export declare function Inject(name: string, ...args: any[]): PropertyDecorator;
-export declare function InjectArray(constructor: Class<any>, ...args: any[]): PropertyDecorator;
-export {};
+export declare function InjectArray(constructor: Class<any> | AbstractClass<any>, ...args: any[]): PropertyDecorator;

package/index.js

@@ -4,9 +4,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectArray = exports.Inject = exports.Injectable = exports.SmartDI = void 0;
 const $registry = Symbol('registry');
 class SmartDI {
+    static register(clazz, options) {
+        const name = (options === null || options === void 0 ? void 0 : options.name) || clazz.name;
+        const args = (options === null || options === void 0 ? void 0 : options.args) || [];
+        const singleton = !(options === null || options === void 0 ? void 0 : options.multiple);
+        if (SmartDI[$registry][name])
+            throw new Error(`Duplicated injectable name '${name}'!`);
+        SmartDI[$registry][name] = {
+            name,
+            class: clazz,
+            args: args,
+            singleton,
+            instance: undefined
+        };
+    }
     static get(clue, ...args) {
         return SmartDI.internalGet(clue, new Set(), ...args);
     }
+    static getArray(clue, ...args) {
+        return SmartDI.internalGetArray(clue, new Set(), ...args);
+    }
     static internalGet(clue, creatings, ...args) {
         let constructor, name;
         if (typeof clue === 'function') {
@@ -57,10 +74,10 @@ class SmartDI {
         let matched = [];
         function isSubclass(sub, sup) {
             let proto = Object.getPrototypeOf(sub);
-            while (proto.name) {
+            while (proto) {
                 if (proto === sup)
                     return true;
-                proto = Object.getPrototypeOf(sub);
+                proto = Object.getPrototypeOf(proto);
             }
             return false;
         }
@@ -83,18 +100,7 @@ _a = $registry;
 SmartDI[_a] = {};
 function Injectable(options) {
     return (target) => {
-        const name = (options === null || options === void 0 ? void 0 : options.name) || target.name;
-        const args = (options === null || options === void 0 ? void 0 : options.args) || [];
-        const singleton = !(options === null || options === void 0 ? void 0 : options.multiple);
-        if (SmartDI[$registry][name])
-            throw new Error(`Duplicated injectable name '${name}'!`);
-        SmartDI[$registry][name] = {
-            name,
-            class: target,
-            args: args,
-            singleton,
-            instance: undefined
-        };
+        SmartDI.register(target, options);
     };
 }
 exports.Injectable = Injectable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartdi",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "A simple dependency injector based on decorators.",
   "main": "index.js",
   "scripts": {